diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2006-03-21 08:32:50 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:59:00 -0500 |
| commit | 07bdbd4592ecae2325a3456fe9d9700e6c256b64 (patch) | |
| tree | 40016c83512dbe1bd327b91cf1235834fa3406b1 /source4/build/smb_build/output.pm | |
| parent | 59c427963f1e445012f8bb78ca46d2ec317e2caf (diff) | |
| download | samba-07bdbd4592ecae2325a3456fe9d9700e6c256b64.tar.gz samba-07bdbd4592ecae2325a3456fe9d9700e6c256b64.tar.bz2 samba-07bdbd4592ecae2325a3456fe9d9700e6c256b64.zip | |
r14606: Fix paths in developer mode. This allows 'make quicktest' to work when
building with --enable-dso
(This used to be commit 614f062748d95a455d1a99a7444fdc0fe152f4e4)
Diffstat (limited to 'source4/build/smb_build/output.pm')
| -rw-r--r-- | source4/build/smb_build/output.pm | 12 |
1 files changed, 11 insertions, 1 deletions
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}; } |