diff options
| -rw-r--r-- | source3/samba4.m4 | 6 | ||||
| -rw-r--r-- | source3/samba4.mk | 5 | ||||
| -rw-r--r-- | source4/Makefile | 3 | ||||
| -rw-r--r-- | source4/build/make/rules.mk | 2 | ||||
| -rw-r--r-- | source4/build/smb_build/output.pm | 2 | ||||
| -rw-r--r-- | source4/configure.ac | 6 |
6 files changed, 12 insertions, 12 deletions
diff --git a/source3/samba4.m4 b/source3/samba4.m4 index 3a78ba4566..c3ecbf37e7 100644 --- 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 3f4fff4d35..a374e81084 100644 --- 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 2d49efb93b..442a62ef62 100644 --- 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 0beb0e2e11..6898432963 100644 --- 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 76c6d3fc8f..aada681ef4 100644 --- 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 b2c169c86a..aa5a3f3b3e 100644 --- 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="" |