[SCM] Samba Shared Repository - branch master updated

[Stefan Metzmacher]

The branch, master has been updated
       via  c01f443... tdb: fix standalone 'make installdocs'
       via  0a3a6bb... tdb: create symbol links to shared libraries see https://bugzilla.samba.org/show_bug.cgi?id=6991 for details
       via  eff6022... talloc: create symbol links to shared libraries see https://bugzilla.samba.org/show_bug.cgi?id=6991 for details
       via  f408d58... tevent: create symbol links to shared libraries see https://bugzilla.samba.org/show_bug.cgi?id=6991 for details
      from  a2044b9... s4: Fix result check for getaddrinfo()

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit c01f443ebca5e0b6f65fe8b3ab031da51dce2e89
Author: Stefan Metzmacher <metze at samba.org>
Date:   Wed Jan 6 14:39:43 2010 +0100

    tdb: fix standalone 'make installdocs'
    
    metze

commit 0a3a6bb8f910df02cb429fdeacf0ab8d683e0b89
Author: Brian Lu <brian.lu at sun.com>
Date:   Thu Dec 17 14:39:09 2009 +0800

    tdb: create symbol links to shared libraries see https://bugzilla.samba.org/show_bug.cgi?id=6991 for details
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>

commit eff6022d51f578dfc48f1d66dd8ec1e860dfd7b3
Author: Brian Lu <brian.lu at sun.com>
Date:   Thu Dec 17 14:48:59 2009 +0800

    talloc: create symbol links to shared libraries see https://bugzilla.samba.org/show_bug.cgi?id=6991 for details
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>

commit f408d58d95f5ac10849742fdcdf7e6160196e8e0
Author: Brian Lu <brian.lu at sun.com>
Date:   Thu Dec 17 14:55:57 2009 +0800

    tevent: create symbol links to shared libraries see https://bugzilla.samba.org/show_bug.cgi?id=6991 for details
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>

-----------------------------------------------------------------------

Summary of changes:
 lib/talloc/talloc.mk |    5 +++++
 lib/tdb/Makefile.in  |    1 +
 lib/tdb/tdb.mk       |   10 +++++++---
 lib/tevent/tevent.mk |    4 ++++
 4 files changed, 17 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/talloc/talloc.mk b/lib/talloc/talloc.mk
index a563d61..fc90f4d 100644
--- a/lib/talloc/talloc.mk
+++ b/lib/talloc/talloc.mk
@@ -1,5 +1,6 @@
 TALLOC_OBJ = $(tallocdir)/talloc.o 
 
+TALLOC_SHLIB = libtalloc.$(SHLIBEXT)
 TALLOC_SOLIB = libtalloc.$(SHLIBEXT).$(TALLOC_VERSION)
 TALLOC_SONAME = libtalloc.$(SHLIBEXT).$(TALLOC_VERSION_MAJOR)
 TALLOC_STLIB = libtalloc.a
@@ -25,6 +26,10 @@ install:: all
 	if [ -f talloc.3 ];then ${INSTALLCMD} -m 644 talloc.3 $(DESTDIR)$(mandir)/man3; fi
 	which swig >/dev/null 2>&1 && ${INSTALLCMD} -d $(DESTDIR)`swig -swiglib` || true
 	which swig >/dev/null 2>&1 && ${INSTALLCMD} -m 644 talloc.i $(DESTDIR)`swig -swiglib` || true
+	rm -f $(DESTDIR)$(libdir)/$(TALLOC_SONAME)
+	ln -s $(TALLOC_SOLIB) $(DESTDIR)$(libdir)/$(TALLOC_SONAME)
+	rm -f $(DESTDIR)$(libdir)/$(TALLOC_SHLIB)
+	ln -s $(TALLOC_SOLIB) $(DESTDIR)$(libdir)/$(TALLOC_SHLIB)
 
 doc:: talloc.3 talloc.3.html
 
diff --git a/lib/tdb/Makefile.in b/lib/tdb/Makefile.in
index 3abeec3..dc22ee3 100644
--- a/lib/tdb/Makefile.in
+++ b/lib/tdb/Makefile.in
@@ -9,6 +9,7 @@ exec_prefix = @exec_prefix@
 bindir = @bindir@
 includedir = @includedir@
 libdir = @libdir@
+mandir = @mandir@
 VPATH = @srcdir@:@libreplacedir@
 srcdir = @srcdir@
 builddir = @builddir@
diff --git a/lib/tdb/tdb.mk b/lib/tdb/tdb.mk
index 93aa899..ecc6f9f 100644
--- a/lib/tdb/tdb.mk
+++ b/lib/tdb/tdb.mk
@@ -61,9 +61,9 @@ doc:: manpages/tdbbackup.8 manpages/tdbdump.8 manpages/tdbtool.8
 	-test -z "$(XSLTPROC)" || $(XSLTPROC) -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
 
 installdocs::
-	${INSTALLCMD} -d $(DESTDIR)$(mandir)/man1
-	for I in manpages/*.1; do \
-		${INSTALLCMD} -m 644 $$I $(DESTDIR)$(mandir)/man1 \
+	${INSTALLCMD} -d $(DESTDIR)$(mandir)/man8
+	for I in manpages/*.8; do \
+		${INSTALLCMD} -m 644 $$I $(DESTDIR)$(mandir)/man8; \
 	done
 
 install-python:: build-python
@@ -91,6 +91,10 @@ installheaders:: installdirs
 installlibs:: all installdirs
 	cp tdb.pc $(DESTDIR)$(libdir)/pkgconfig
 	cp $(TDB_STLIB) $(TDB_SOLIB) $(DESTDIR)$(libdir)
+	rm -f $(DESTDIR)$(libdir)/libtdb.$(SHLIBEXT)
+	ln -s $(TDB_SOLIB) $(DESTDIR)$(libdir)/libtdb.$(SHLIBEXT)
+	rm -f $(DESTDIR)$(libdir)/$(TDB_SONAME)
+	ln -s $(TDB_SOLIB) $(DESTDIR)$(libdir)/$(TDB_SONAME)
 
 $(TDB_STLIB): $(TDB_OBJ)
 	ar -rv $(TDB_STLIB) $(TDB_OBJ)
diff --git a/lib/tevent/tevent.mk b/lib/tevent/tevent.mk
index 694d082..57bfd81 100644
--- a/lib/tevent/tevent.mk
+++ b/lib/tevent/tevent.mk
@@ -26,6 +26,10 @@ installheaders:: installdirs
 installlibs:: installdirs
 	cp tevent.pc $(DESTDIR)$(libdir)/pkgconfig
 	cp $(TEVENT_STLIB) $(TEVENT_SOLIB) $(DESTDIR)$(libdir)
+	rm -f $(DESTDIR)$(libdir)/$(TEVENT_SONAME)
+	ln -s $(TEVENT_SOLIB) $(DESTDIR)$(libdir)/$(TEVENT_SONAME)
+	rm -f $(DESTDIR)$(libdir)/$(TEVENT_SOBASE)
+	ln -s $(TEVENT_SOLIB) $(DESTDIR)$(libdir)/$(TEVENT_SOBASE)
 
 install:: all installdirs installheaders installlibs $(PYTHON_INSTALL_TARGET)
 


-- 
Samba Shared Repository