diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2008-05-12 09:44:27 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2008-05-12 09:44:27 +1000 |
| commit | b869a525b1f40baf881a725e5632b39c99268d67 (patch) | |
| tree | 594e53b6f5ad26e28ad8fe78d9119275e4ac319d /source4/build/make | |
| parent | 00ebe3df811a9eb7737fa6278d8784500c35bd14 (diff) | |
| parent | 5d02514f72c6c89bc28b4c5de3d95bb8a439b56e (diff) | |
| download | samba-b869a525b1f40baf881a725e5632b39c99268d67.tar.gz samba-b869a525b1f40baf881a725e5632b39c99268d67.tar.bz2 samba-b869a525b1f40baf881a725e5632b39c99268d67.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
(This used to be commit 61c31dc7cf649bc6f2d14bc8637e50ead9b9210a)
Diffstat (limited to 'source4/build/make')
| -rw-r--r-- | source4/build/make/python.mk | 8 | ||||
| -rw-r--r-- | source4/build/make/rules.mk | 7 |
2 files changed, 9 insertions, 6 deletions
diff --git a/source4/build/make/python.mk b/source4/build/make/python.mk index 6c1798212e..c243b88e27 100644 --- a/source4/build/make/python.mk +++ b/source4/build/make/python.mk @@ -1,14 +1,18 @@ pythonbuilddir = $(builddir)/bin/python +installpython:: + mkdir -p $(DESTDIR)$(pythondir) + # Install Python # Arguments: Module path define python_module_template installpython:: $$(pythonbuilddir)/$(1) ; - cp $$< $$(DESTDIR)$$(PYTHONDIR)/$(1) + mkdir -p $$(DESTDIR)$$(pythondir)/$$(dir $(1)) + cp $$< $$(DESTDIR)$$(pythondir)/$(1) uninstallpython:: - rm -f $$(DESTDIR)$$(PYTHONDIR)/$(1) ; + rm -f $$(DESTDIR)$$(pythondir)/$(1) ; pythonmods:: $$(pythonbuilddir)/$(1) ; diff --git a/source4/build/make/rules.mk b/source4/build/make/rules.mk index 1fc5e23569..c0359a8297 100644 --- a/source4/build/make/rules.mk +++ b/source4/build/make/rules.mk @@ -176,7 +176,7 @@ endef define shared_module_install_template installplugins:: bin/modules/$(1)/$(2) - @echo Installing$(2) as $$(DESTDIR)$$(modulesdir)/$(1)/$(2) + @echo Installing $(2) as $$(DESTDIR)$$(modulesdir)/$(1)/$(2) @mkdir -p $$(DESTDIR)$$(modulesdir)/$(1)/ @cp bin/modules/$(1)/$(2) $$(DESTDIR)$$(modulesdir)/$(1)/$(2) uninstallplugins:: @@ -212,8 +212,7 @@ include/includes.d: include/includes.h @-mkdir -p `dirname $@` @$(COMPILE) && exit 0 ; \ echo "The following command failed:" 1>&2;\ - echo "$(COMPILE)" 1>&2 && exit 1 - + echo "$(subst ",\",$(COMPILE))" 1>&2 && exit 1 .c.ho: @@ -221,7 +220,7 @@ include/includes.d: include/includes.h @-mkdir -p `dirname $@` @$(HCOMPILE) && exit 0;\ echo "The following command failed:" 1>&2;\ - echo "$(HCOMPILE)" 1>&2;\ + echo "$(subst ",\",$(HCOMPILE))" 1>&2;\ $(HCOMPILE) >/dev/null 2>&1 .h.h.gch: |