summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
Diffstat (limited to 'source4')
-rw-r--r--source4/Makefile3
-rw-r--r--source4/build/make/rules.mk2
-rw-r--r--source4/build/smb_build/output.pm2
-rw-r--r--source4/configure.ac6
4 files changed, 7 insertions, 6 deletions
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=""