diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2006-03-22 22:55:29 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:59:06 -0500 |
| commit | 58483adfb669b0863f67641f70517a102833bcae (patch) | |
| tree | 16b35f314a1a689d2cf45088b31ef65c902f97bd /source4/build/smb_build/output.pm | |
| parent | 5dd94460996568706dbbf9819e58ece4b0b82686 (diff) | |
| download | samba-58483adfb669b0863f67641f70517a102833bcae.tar.gz samba-58483adfb669b0863f67641f70517a102833bcae.tar.bz2 samba-58483adfb669b0863f67641f70517a102833bcae.zip | |
r14666: Fix handling of naming of shared modules when not in developer mode
(This used to be commit 2638899529ca17ee0557d4491a51c21437b581b3)
Diffstat (limited to 'source4/build/smb_build/output.pm')
| -rw-r--r-- | source4/build/smb_build/output.pm | 31 |
1 files changed, 14 insertions, 17 deletions
diff --git a/source4/build/smb_build/output.pm b/source4/build/smb_build/output.pm index acff857497..8b7f774f26 100644 --- a/source4/build/smb_build/output.pm +++ b/source4/build/smb_build/output.pm @@ -59,26 +59,23 @@ sub generate_shared_library($) } 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)"; - - if (defined($lib->{VERSION})) { - $lib->{LIBRARY_SONAME} = $lib->{LIBRARY_NAME}.".$lib->{SO_VERSION}"; - $lib->{LIBRARY_REALNAME} = $lib->{LIBRARY_NAME}.".$lib->{VERSION}"; - } elsif ($lib->{TYPE} eq "MODULE") { $lib->{DEBUGDIR} = "bin/modules/$lib->{SUBSYSTEM}"; - } - - if (defined($lib->{FIXED_NAME})) { - $lib->{TARGET} = "$lib->{DEBUGDIR}/$lib->{FIXED_NAME}.\$(SHLIBEXT)"; + $lib->{RELEASEDIR} = "bin/install/modules/$lib->{SUBSYSTEM}"; + $lib->{LIBRARY_REALNAME} = $link_name; + $lib->{LIBRARY_REALNAME} =~ s/^$lib->{SUBSYSTEM}_//g; + $lib->{LIBRARY_REALNAME}.= ".\$(SHLIBEXT)"; } else { - $lib->{TARGET} = "$lib->{DEBUGDIR}/$lib->{LIBRARY_REALNAME}"; + $lib->{DEBUGDIR} = "bin"; + $lib->{RELEASEDIR} = "bin/install"; + $lib->{LIBRARY_REALNAME} = "$lib_name.\$(SHLIBEXT)"; } + + if (defined($lib->{VERSION})) { + $lib->{LIBRARY_SONAME} = $lib->{LIBRARY_REALNAME}.".$lib->{SO_VERSION}"; + $lib->{LIBRARY_REALNAME} = $lib->{LIBRARY_REALNAME}.".$lib->{VERSION}"; + } + + $lib->{TARGET} = "$lib->{DEBUGDIR}/$lib->{LIBRARY_REALNAME}"; $lib->{OUTPUT} = $lib->{TARGET}; } |