summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-05-10 23:25:50 +0200
committerJelmer Vernooij <jelmer@samba.org>2008-05-10 23:25:50 +0200
commit97fbad6480b992421862eab3b347ff6a9bd33e8f (patch)
treeeb006ffbb0cf765797769765465a73d2326f9453
parent778681e10a80ce25e23c708b41958c61cbce2545 (diff)
downloadsamba-97fbad6480b992421862eab3b347ff6a9bd33e8f.tar.gz
samba-97fbad6480b992421862eab3b347ff6a9bd33e8f.tar.bz2
samba-97fbad6480b992421862eab3b347ff6a9bd33e8f.zip
Install standalone python modules (so we can use stock python rather than smbpython).
(This used to be commit bb5c9fc64b6ad275abdd98a19f018953c9d79cbd)
-rw-r--r--source4/build/make/python.mk8
-rw-r--r--source4/scripting/python/config.m45
-rw-r--r--source4/scripting/python/config.mk6
3 files changed, 11 insertions, 8 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/scripting/python/config.m4 b/source4/scripting/python/config.m4
index 3790071ba8..a61d541049 100644
--- a/source4/scripting/python/config.m4
+++ b/source4/scripting/python/config.m4
@@ -71,3 +71,8 @@ else
AC_MSG_ERROR([Python not found. Please install Python 2.x and its development headers/libraries.])
fi
+AC_MSG_CHECKING(python library directory)
+pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1, 0, '\\${prefix}')"`
+AC_MSG_RESULT($pythondir)
+
+AC_SUBST(pythondir)
diff --git a/source4/scripting/python/config.mk b/source4/scripting/python/config.mk
index 15be4ca309..a0f5caad3b 100644
--- a/source4/scripting/python/config.mk
+++ b/source4/scripting/python/config.mk
@@ -23,9 +23,3 @@ python_misc_OBJ_FILES = scripting/python/misc_wrap.o
_PY_FILES = $(shell find scripting/python -name "*.py")
$(foreach pyfile, $(_PY_FILES),$(eval $(call python_py_module_template,$(patsubst scripting/python/%,%,$(pyfile)),$(pyfile))))
-
-installpython:: pythonmods
- @$(SHELL) $(srcdir)/script/installpython.sh \
- $(INSTALLPERMS) \
- $(DESTDIR)$(PYTHONDIR) \
- scripting/python bin/python