diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-10-05 19:51:29 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 15:07:47 -0500 |
| commit | 8c2ef262a83041fc194b32e412afb18647733ce0 (patch) | |
| tree | 72a32c1ce2d2b2e839e0d42f70c56b109a268a31 /source4/build/smb_build/output.pm | |
| parent | 719a4ae0d32ab9ba817fd01f2b8f4cba220a8c60 (diff) | |
| download | samba-8c2ef262a83041fc194b32e412afb18647733ce0.tar.gz samba-8c2ef262a83041fc194b32e412afb18647733ce0.tar.bz2 samba-8c2ef262a83041fc194b32e412afb18647733ce0.zip | |
r25524: Fix directory names for local module builds.
(This used to be commit 93e5a568e3da1c8b2e7decb2a675456ad35dc29b)
Diffstat (limited to 'source4/build/smb_build/output.pm')
| -rw-r--r-- | source4/build/smb_build/output.pm | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source4/build/smb_build/output.pm b/source4/build/smb_build/output.pm index ec273b894a..42e68abec9 100644 --- a/source4/build/smb_build/output.pm +++ b/source4/build/smb_build/output.pm @@ -55,9 +55,11 @@ sub generate_shared_library($) $lib->{SHAREDDIR} = $lib->{BASEDIR}; } else { if ($lib->{TYPE} eq "MODULE") { - $lib->{SHAREDDIR} = "bin/modules/$lib->{SUBSYSTEM}"; + my $sane_subsystem = lc($lib->{SUBSYSTEM}); + $sane_subsystem =~ s/^lib//; + $lib->{SHAREDDIR} = "bin/modules/$sane_subsystem"; $lib->{LIBRARY_REALNAME} = $link_name; - $lib->{LIBRARY_REALNAME} =~ s/^$lib->{SUBSYSTEM}_//g; + $lib->{LIBRARY_REALNAME} =~ s/^$sane_subsystem\_//g; $lib->{LIBRARY_REALNAME}.= ".\$(SHLIBEXT)"; } else { $lib->{SHAREDDIR} = "bin/shared"; |