summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2007-11-25 20:55:53 +0100
committerStefan Metzmacher <metze@samba.org>2007-12-21 05:46:11 +0100
commit12b7148fda768ff30d1ff526b12ccfd972f4f91b (patch)
tree0abeaa57867f6af08fa540165c47833c754ebc56 /source4
parente541cc54f41ff8ed88047b3533a5615beec0dbe7 (diff)
downloadsamba-12b7148fda768ff30d1ff526b12ccfd972f4f91b.tar.gz
samba-12b7148fda768ff30d1ff526b12ccfd972f4f91b.tar.bz2
samba-12b7148fda768ff30d1ff526b12ccfd972f4f91b.zip
r26120: Don't install python modules as modules.
(This used to be commit 1359f858d6c3201ef6927499700f9f71d7805e01)
Diffstat (limited to 'source4')
-rw-r--r--source4/build/smb_build/makefile.pm6
1 files changed, 3 insertions, 3 deletions
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm
index 954c476f33..f886b0ecc6 100644
--- a/source4/build/smb_build/makefile.pm
+++ b/source4/build/smb_build/makefile.pm
@@ -314,11 +314,11 @@ sub SharedModule($$)
if ($ctx->{TYPE} eq "PYTHON") {
push (@{$self->{python_dsos}},
"$ctx->{SHAREDDIR}/$ctx->{LIBRARY_REALNAME}");
+ } else {
+ push (@{$self->{shared_modules}}, "$ctx->{TARGET_SHARED_LIBRARY}");
+ push (@{$self->{plugins}}, "$ctx->{SHAREDDIR}/$ctx->{LIBRARY_REALNAME}");
}
- push (@{$self->{shared_modules}}, "$ctx->{TARGET_SHARED_LIBRARY}");
- push (@{$self->{plugins}}, "$ctx->{SHAREDDIR}/$ctx->{LIBRARY_REALNAME}");
-
$self->{install_plugins} .= "\t\@echo Installing $ctx->{SHAREDDIR}/$ctx->{LIBRARY_REALNAME} as \$(DESTDIR)\$(MODULESDIR)/$sane_subsystem/$ctx->{LIBRARY_REALNAME}\n";
$self->{install_plugins} .= "\t\@mkdir -p \$(DESTDIR)\$(MODULESDIR)/$sane_subsystem/\n";
$self->{install_plugins} .= "\t\@cp $ctx->{SHAREDDIR}/$ctx->{LIBRARY_REALNAME} \$(DESTDIR)\$(MODULESDIR)/$sane_subsystem/$ctx->{LIBRARY_REALNAME}\n";