summaryrefslogtreecommitdiff
path: root/source4/build/smb_build/output.pm
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2007-11-21 11:10:45 +0100
committerStefan Metzmacher <metze@samba.org>2007-12-21 05:45:50 +0100
commit5256d93a458d0f653afa788bb8f8d894dd1a25b2 (patch)
tree8a618f3a269e57e59af73f77a71c58bbfc380865 /source4/build/smb_build/output.pm
parent6b62805ce7db000420752f56b0544d2aecc51833 (diff)
downloadsamba-5256d93a458d0f653afa788bb8f8d894dd1a25b2.tar.gz
samba-5256d93a458d0f653afa788bb8f8d894dd1a25b2.tar.bz2
samba-5256d93a458d0f653afa788bb8f8d894dd1a25b2.zip
r26067: Merge improvements building Python modules.
(This used to be commit 11a2cbbac51781e72ae1288c8e30f175526b01a8)
Diffstat (limited to 'source4/build/smb_build/output.pm')
-rw-r--r--source4/build/smb_build/output.pm5
1 files changed, 3 insertions, 2 deletions
diff --git a/source4/build/smb_build/output.pm b/source4/build/smb_build/output.pm
index 42e68abec9..17d5755348 100644
--- a/source4/build/smb_build/output.pm
+++ b/source4/build/smb_build/output.pm
@@ -49,9 +49,10 @@ sub generate_shared_library($)
$lib_name = "lib$link_name";
}
- if (defined($lib->{LIBRARY_REALNAME})) {
+ if ($lib->{TYPE} eq "PYTHON") {
+ $lib->{SHAREDDIR} = "bin/python";
+ } elsif (defined($lib->{LIBRARY_REALNAME})) {
$lib->{BASEDIR} =~ s/^\.\///g;
- $lib->{LIBRARY_REALNAME} = "$lib->{LIBRARY_REALNAME}";
$lib->{SHAREDDIR} = $lib->{BASEDIR};
} else {
if ($lib->{TYPE} eq "MODULE") {