summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-10-30 23:19:51 +0100
committerJelmer Vernooij <jelmer@samba.org>2008-10-30 23:19:51 +0100
commitc9f69f1436cb02567f679b8461e9cb0dfbd5cddc (patch)
treeee2f18ccb0301f4b4e10532b13df4c9c6233b714 /source3
parent9da4c3f8309c8a89311493b014db6eba0b2fa827 (diff)
downloadsamba-c9f69f1436cb02567f679b8461e9cb0dfbd5cddc.tar.gz
samba-c9f69f1436cb02567f679b8461e9cb0dfbd5cddc.tar.bz2
samba-c9f69f1436cb02567f679b8461e9cb0dfbd5cddc.zip
Fix installation of Samba 4 during merged build.
Diffstat (limited to 'source3')
-rw-r--r--source3/samba4.mk9
1 files changed, 6 insertions, 3 deletions
diff --git a/source3/samba4.mk b/source3/samba4.mk
index e08cbfcfec..c3b6af10e4 100644
--- a/source3/samba4.mk
+++ b/source3/samba4.mk
@@ -118,20 +118,21 @@ tallocsrcdir := $(samba4srcdir)/../lib/talloc
comsrcdir := $(samba4srcdir)/lib/com
override ASN1C = bin/asn1_compile4
override ET_COMPILER = bin/compile_et4
+include $(samba4srcdir)/build/make/python.mk
include samba4-data.mk
include $(samba4srcdir)/static_deps.mk
-include $(samba4srcdir)/build/make/python.mk
INSTALLPERMS = 0755
+$(foreach SCRIPT,$(wildcard scripting/bin/*),$(eval $(call binary_install_template,$(SCRIPT))))
-$(DESTDIR)$(bindir)/%: bin/%4 installdirs
+$(DESTDIR)$(bindir)/%4: bin/%4 installdirs
@mkdir -p $(@D)
@echo Installing $(@F) as $@
@if test -f $@; then rm -f $@.old; mv $@ $@.old; fi
@cp $< $@
@chmod $(INSTALLPERMS) $@
-$(DESTDIR)$(sbindir)/%: bin/%4 installdirs
+$(DESTDIR)$(sbindir)/%4: bin/%4 installdirs
@mkdir -p $(@D)
@echo Installing $(@F) as $@
@if test -f $@; then rm -f $@.old; mv $@ $@.old; fi
@@ -158,6 +159,8 @@ clean::
proto:: $(PROTO_HEADERS)
modules:: $(PLUGINS)
+pythonmods:: $(PYTHON_PYS) $(PYTHON_SO)
+
all:: bin/samba4 bin/regpatch4 bin/regdiff4 bin/regshell4 bin/regtree4 bin/smbclient4
torture:: bin/smbtorture4
everything:: $(patsubst %,%4,$(BINARIES))