[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha3-1500-gbb5c9fc

[Jelmer Vernooij]

The branch, v4-0-test has been updated
       via  bb5c9fc64b6ad275abdd98a19f018953c9d79cbd (commit)
      from  1f698b96c7962a453f037815c9160cd8d7dde3f6 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test


- Log -----------------------------------------------------------------
commit bb5c9fc64b6ad275abdd98a19f018953c9d79cbd
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sat May 10 23:25:50 2008 +0200

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

-----------------------------------------------------------------------

Summary of changes:
 source/build/make/python.mk       |    8 ++++++--
 source/scripting/python/config.m4 |    5 +++++
 source/scripting/python/config.mk |    6 ------
 3 files changed, 11 insertions(+), 8 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/build/make/python.mk b/source/build/make/python.mk
index 6c17982..c243b88 100644
--- a/source/build/make/python.mk
+++ b/source/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/source/scripting/python/config.m4 b/source/scripting/python/config.m4
index 3790071..a61d541 100644
--- a/source/scripting/python/config.m4
+++ b/source/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/source/scripting/python/config.mk b/source/scripting/python/config.mk
index 15be4ca..a0f5caa 100644
--- a/source/scripting/python/config.mk
+++ b/source/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


-- 
Samba Shared Repository