diff options
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/samba4.m4 | 6 | ||||
| -rw-r--r-- | source3/samba4.mk | 5 |
2 files changed, 5 insertions, 6 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 |