From 07bdbd4592ecae2325a3456fe9d9700e6c256b64 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Tue, 21 Mar 2006 08:32:50 +0000 Subject: r14606: Fix paths in developer mode. This allows 'make quicktest' to work when building with --enable-dso (This used to be commit 614f062748d95a455d1a99a7444fdc0fe152f4e4) --- source4/build/smb_build/output.pm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'source4/build/smb_build/output.pm') diff --git a/source4/build/smb_build/output.pm b/source4/build/smb_build/output.pm index 594d1d48c7..acff857497 100644 --- a/source4/build/smb_build/output.pm +++ b/source4/build/smb_build/output.pm @@ -58,6 +58,11 @@ sub generate_shared_library($) $lib_name = "lib$link_name"; } + if ($lib->{TYPE} eq "MODULE") { + $lib->{FIXED_NAME} = $link_name; + $lib->{FIXED_NAME} =~ s/^$lib->{SUBSYSTEM}_//g; + } + $lib->{DEBUGDIR} = "bin"; $lib->{RELEASEDIR} = "bin/install"; $lib->{LIBRARY_REALNAME} = $lib->{LIBRARY_NAME} = "$lib_name.\$(SHLIBEXT)"; @@ -68,7 +73,12 @@ sub generate_shared_library($) } elsif ($lib->{TYPE} eq "MODULE") { $lib->{DEBUGDIR} = "bin/modules/$lib->{SUBSYSTEM}"; } - $lib->{TARGET} = "$lib->{DEBUGDIR}/$lib->{LIBRARY_REALNAME}"; + + if (defined($lib->{FIXED_NAME})) { + $lib->{TARGET} = "$lib->{DEBUGDIR}/$lib->{FIXED_NAME}.\$(SHLIBEXT)"; + } else { + $lib->{TARGET} = "$lib->{DEBUGDIR}/$lib->{LIBRARY_REALNAME}"; + } $lib->{OUTPUT} = $lib->{TARGET}; } -- cgit