diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-12-23 01:53:38 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-12-23 01:53:38 +0100 |
| commit | 8ada2737005d8a5f065949ba13da43ef72c17d45 (patch) | |
| tree | beed060b9d80667fe697827d9478f3a24ab4cd60 /source4/build | |
| parent | e6d55522507ef06abbc282547a7f65fbc4243b90 (diff) | |
| download | samba-8ada2737005d8a5f065949ba13da43ef72c17d45.tar.gz samba-8ada2737005d8a5f065949ba13da43ef72c17d45.tar.bz2 samba-8ada2737005d8a5f065949ba13da43ef72c17d45.zip | |
Use make variable for Samba 4 shared library output directory.
Diffstat (limited to 'source4/build')
| -rw-r--r-- | source4/build/make/rules.mk | 2 | ||||
| -rw-r--r-- | source4/build/smb_build/output.pm | 2 |
2 files changed, 2 insertions, 2 deletions
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)"; } } |