summaryrefslogtreecommitdiff
path: root/source4/build/smb_build
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2006-03-19 19:47:05 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:58:49 -0500
commit184955ffd711a5db8b1e1b7c179c232ce0e29145 (patch)
tree5321ac3a189f98de5a3309b3be7c45968289c5a3 /source4/build/smb_build
parentc06acda7d5b78bfd5c098477b1ca9d949092e281 (diff)
downloadsamba-184955ffd711a5db8b1e1b7c179c232ce0e29145.tar.gz
samba-184955ffd711a5db8b1e1b7c179c232ce0e29145.tar.bz2
samba-184955ffd711a5db8b1e1b7c179c232ce0e29145.zip
r14572: Give libraries saner names, remove some .pc files, make some things
subsystems in case a library doesn't make sense. (This used to be commit ed382873fd01457a53e0a1e1f5ba6753dfbc0646)
Diffstat (limited to 'source4/build/smb_build')
-rw-r--r--source4/build/smb_build/config_mk.pm2
-rw-r--r--source4/build/smb_build/makefile.pm2
2 files changed, 2 insertions, 2 deletions
diff --git a/source4/build/smb_build/config_mk.pm b/source4/build/smb_build/config_mk.pm
index abf88662b6..41e90c33b7 100644
--- a/source4/build/smb_build/config_mk.pm
+++ b/source4/build/smb_build/config_mk.pm
@@ -139,7 +139,7 @@ sub run_config_mk($$$)
$prev = "";
}
- if ($line =~ /^\[([a-zA-Z0-9_:]+)\][\t ]*$/)
+ if ($line =~ /^\[([-a-zA-Z0-9_:]+)\][\t ]*$/)
{
$section = $1;
$infragment = 0;
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm
index b0c7ea3be1..03c172c38d 100644
--- a/source4/build/smb_build/makefile.pm
+++ b/source4/build/smb_build/makefile.pm
@@ -202,7 +202,7 @@ sub SharedLibrary($$)
if ($ctx->{TYPE} eq "LIBRARY") {
push (@{$self->{shared_libs}}, "$ctx->{DEBUGDIR}/$ctx->{LIBRARY_REALNAME}");
- push (@{$self->{installable_shared_libs}}, "$installdir/$ctx->{LIBRARY_REALNAME}");
+ push (@{$self->{installable_shared_libs}}, "$installdir/$ctx->{LIBRARY_REALNAME}") if (defined($ctx->{SO_VERSION}));
} elsif ($ctx->{TYPE} eq "MODULE") {
push (@{$self->{shared_modules}}, "$ctx->{DEBUGDIR}/$ctx->{LIBRARY_REALNAME}");
push (@{$self->{plugins}}, "$installdir/$ctx->{LIBRARY_REALNAME}");