Use make variable for Samba 4 shared library output directory.

diff --git a/source3/samba4.m4 b/source3/samba4.m4
index 3a78ba456673a6c956bd1906439de40a7fa31c83..c3ecbf37e7c6c490a56f1db3ab84240e2c6b3705 100644 (file)
--- a/source3/samba4.m4
+++ b/source3/samba4.m4
@@ -123,10 +123,10 @@ AC_SUBST(INTERN_LDFLAGS)
 AC_SUBST(INSTALL_LINK_FLAGS)
 if test $USESHARED = "true";
 then
-       INTERN_LDFLAGS="-L\${builddir}/bin/shared -L\${builddir}/bin/static"
-       INSTALL_LINK_FLAGS="-Wl,-rpath-link,\${builddir}/bin/shared";
+       INTERN_LDFLAGS="-L\$(shliboutputdir) -L\${builddir}/bin/static"
+       INSTALL_LINK_FLAGS="-Wl,-rpath-link,\$(shliboutputdir)";
 else
-       INTERN_LDFLAGS="-L\${builddir}/bin/static -L\${builddir}/bin/shared"
+       INTERN_LDFLAGS="-L\${builddir}/bin/static -L\$(shliboutputdir)"
 fi
 
 dnl Samba 4 files

diff --git a/source3/samba4.mk b/source3/samba4.mk
index 3f4fff4d354a7c5d5ff2057f657993dad7fd29eb..a374e8108425a273b81a18785a26732fdb499bd0 100644 (file)
--- a/source3/samba4.mk
+++ b/source3/samba4.mk
@@ -6,6 +6,7 @@ HOSTLD = $(CC)
 PARTLINK = $(PROG_LD) -r
 MDLD = $(SHLD)
 MDLD_FLAGS = $(LDSHFLAGS) 
+shliboutputdir = bin/shared
 
 samba4srcdir = $(srcdir)/../source4
 
@@ -59,8 +60,6 @@ endif
        @mkdir -p $(@D)
        @$(AR) -rc $@ $^
 
-INTERN_LDFLAGS = -L${builddir}/bin/static -L${builddir}/bin/shared
-
 pidldir = $(samba4srcdir)/../pidl
 include $(pidldir)/config.mk
 include samba4-config.mk
@@ -151,7 +150,7 @@ clean::
        @-find $(samba4srcdir) -name '*.ho' -exec rm -f '{}' \;
        @echo Removing samba 4 libraries
        @-rm -f $(STATIC_LIBS) $(SHARED_LIBS)
-       @-rm -f bin/static/*.a bin/shared/*.$(SHLIBEXT) bin/mergedobj/*.o
+       @-rm -f bin/static/*.a $(shliboutputdir)/*.$(SHLIBEXT) bin/mergedobj/*.o
        @echo Removing samba 4 modules
        @-rm -f bin/modules/*/*.$(SHLIBEXT)
        @-rm -f bin/*_init_module.c

diff --git a/source4/Makefile b/source4/Makefile
index 2d49efb93b26c01f4ee0c045f4b6b0e6dd9419d2..442a62ef62545377cef36e4cf3a497f918b4bac9 100644 (file)
--- a/source4/Makefile
+++ b/source4/Makefile
@@ -15,6 +15,7 @@ torturedir = ../lib/torture
 swatdir = $(datadir)/swat
 setupdir = $(datadir)/setup
 ncalrpcdir = $(localstatedir)/ncalrpc
+shliboutputdir = $(builddir)/bin/shared
 
 BNLD = $(LD)
 BNLD_FLAGS = $(LDFLAGS) $(SYS_LDFLAGS)
@@ -155,7 +156,7 @@ manpages:: $(MANPAGES)
 all:: showflags $(ALL_PREDEP) binaries modules pythonmods libraries headers
 everything:: all
 
-LD_LIBPATH_OVERRIDE = $(LIB_PATH_VAR)=$(builddir)/bin/shared
+LD_LIBPATH_OVERRIDE = $(LIB_PATH_VAR)=$(shliboutputdir)
 
 # 'make testsuite' creates all binaries which are
 # needed by samba3's 'make test' and the build-farm

diff --git a/source4/build/make/rules.mk b/source4/build/make/rules.mk
index 0beb0e2e111dfc75c8412dfef09ae222702df09a..68984329635022dfa81f885c16307aefe4b6d073 100644 (file)
--- a/source4/build/make/rules.mk
+++ b/source4/build/make/rules.mk
@@ -45,7 +45,7 @@ clean:: clean_pch
        @-find . -name '*.ho' -exec rm -f '{}' \;
        @echo Removing libraries
        @-rm -f $(STATIC_LIBS) $(SHARED_LIBS)
-       @-rm -f bin/static/*.a bin/shared/*.$(SHLIBEXT) bin/mergedobj/*.o
+       @-rm -f bin/static/*.a $(shliboutputdir)/*.$(SHLIBEXT) bin/mergedobj/*.o
        @echo Removing modules
        @-rm -f bin/modules/*/*.$(SHLIBEXT)
        @-rm -f bin/*_init_module.c

diff --git a/source4/build/smb_build/output.pm b/source4/build/smb_build/output.pm
index 76c6d3fc8fe6f1d9ccbd2f74b892b5f22f9dde7a..aada681ef429af65d072e6303ee1074b05c8cbc5 100644 (file)
--- a/source4/build/smb_build/output.pm
+++ b/source4/build/smb_build/output.pm
@@ -40,7 +40,7 @@ sub generate_shared_library($)
                        $lib->{LIBRARY_REALNAME} =~ s/^$sane_subsystem\_//g;
                        $lib->{LIBRARY_REALNAME}.= ".\$(SHLIBEXT)";
                } else {
-                       $lib->{SHAREDDIR} = "bin/shared";
+                       $lib->{SHAREDDIR} = "\$(shliboutputdir)";
                        $lib->{LIBRARY_REALNAME} = "$lib_name.\$(SHLIBEXT)";
                }
        }

diff --git a/source4/configure.ac b/source4/configure.ac
index b2c169c86a93a79ed97d55d3c541314d3678f8f4..aa5a3f3b3ef7f5179e372a648bd40cf21faee464 100644 (file)
--- a/source4/configure.ac
+++ b/source4/configure.ac
@@ -149,10 +149,10 @@ AC_SUBST(INTERN_LDFLAGS)
 AC_SUBST(INSTALL_LINK_FLAGS)
 if test $USESHARED = "true";
 then
-       INTERN_LDFLAGS="-L\${builddir}/bin/shared -L\${builddir}/bin/static"
-       INSTALL_LINK_FLAGS="-Wl,-rpath-link,\${builddir}/bin/shared";
+       INTERN_LDFLAGS="-L\$(shliboutputdir) -L\${builddir}/bin/static"
+       INSTALL_LINK_FLAGS="-Wl,-rpath-link,\$(shliboutputdir)";
 else
-       INTERN_LDFLAGS="-L\${builddir}/bin/static -L\${builddir}/bin/shared"
+       INTERN_LDFLAGS="-L\${builddir}/bin/static -L\$(shliboutputdir)"
 fi
 
 builddir_headers=""