summaryrefslogtreecommitdiff
path: root/source4
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 /source4
parent9da4c3f8309c8a89311493b014db6eba0b2fa827 (diff)
downloadsamba-c9f69f1436cb02567f679b8461e9cb0dfbd5cddc.tar.gz
samba-c9f69f1436cb02567f679b8461e9cb0dfbd5cddc.tar.bz2
samba-c9f69f1436cb02567f679b8461e9cb0dfbd5cddc.zip
Fix installation of Samba 4 during merged build.
Diffstat (limited to 'source4')
-rw-r--r--source4/build/make/python.mk2
-rw-r--r--source4/lib/registry/config.mk2
-rw-r--r--source4/scripting/python/config.mk2
3 files changed, 3 insertions, 3 deletions
diff --git a/source4/build/make/python.mk b/source4/build/make/python.mk
index 66e5def8f0..f9410eec97 100644
--- a/source4/build/make/python.mk
+++ b/source4/build/make/python.mk
@@ -46,7 +46,7 @@ swig:: pythonmods
.SUFFIXES: _wrap.c .i .py
%_wrap.c %.py: %.i
- [ "$(SWIG)" == "no" ] || $(SWIG) -O -Wall -I$(srcdir)/scripting/swig -python -keyword $<
+ [ "$(SWIG)" == "no" ] || $(SWIG) -O -Wall -python -keyword $<
realdistclean::
@echo "Removing SWIG output files"
diff --git a/source4/lib/registry/config.mk b/source4/lib/registry/config.mk
index fd1fd01a09..2e2b45abe9 100644
--- a/source4/lib/registry/config.mk
+++ b/source4/lib/registry/config.mk
@@ -109,6 +109,6 @@ PUBLIC_DEPENDENCIES = registry
swig_registry_OBJ_FILES = $(libregistrysrcdir)/registry_wrap.o
-$(eval $(call python_py_module_template,samba/registry.py,lib/registry/registry.py))
+$(eval $(call python_py_module_template,samba/registry.py,$(libregistrysrcdir)/registry.py))
$(swig_registry_OBJ_FILES): CFLAGS+=$(CFLAG_NO_UNUSED_MACROS) $(CFLAG_NO_CAST_QUAL)
diff --git a/source4/scripting/python/config.mk b/source4/scripting/python/config.mk
index 5a44fd5ae6..7024684ff9 100644
--- a/source4/scripting/python/config.mk
+++ b/source4/scripting/python/config.mk
@@ -25,7 +25,7 @@ $(python_misc_OBJ_FILES): CFLAGS+=$(CFLAG_NO_UNUSED_MACROS) $(CFLAG_NO_CAST_QUAL
_PY_FILES = $(shell find $(pyscriptsrcdir)/samba ../lib/subunit/python -name "*.py")
-$(foreach pyfile, $(_PY_FILES),$(eval $(call python_py_module_template,$(patsubst $(pyscriptsrcdir)/%,%,$(pyfile)),$(pyfile))))
+$(eval $(foreach pyfile, $(_PY_FILES),$(call python_py_module_template,$(patsubst $(pyscriptsrcdir)/%,%,$(pyfile)),$(pyfile))))
$(eval $(call python_py_module_template,samba/misc.py,$(pyscriptsrcdir)/misc.py))