Install standalone python modules (so we can use stock python rather than smbpython).

(This used to be commit bb5c9fc64b6ad275abdd98a19f018953c9d79cbd)

diff --git a/source4/build/make/python.mk b/source4/build/make/python.mk
index 6c1798212e89d557f019062d580375f093d307bd..c243b88e27ba9e466a6e6ed1f59e4a84aaed109c 100644 (file)
--- 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 3790071ba88cc3148b517e78147ae3b1dcba5196..a61d5410493762d6cfb27c7c4f6622391fb6b0ab 100644 (file)
--- 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 15be4ca3093beebcb8d34372d42480a71258273b..a0f5caad3bde796b4fc6e3d34e6e46342dc052d4 100644 (file)
--- 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