summaryrefslogtreecommitdiff
path: root/source4/build
diff options
context:
space:
mode:
Diffstat (limited to 'source4/build')
-rw-r--r--source4/build/make/rules.mk2
-rw-r--r--source4/build/smb_build/output.pm2
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)";
}
}