[xml/sgml-commit] r394 - packages/libxslt/trunk/debian

[Mike Hommey]

Author: glandium
Date: 2005-03-28 17:19:34 +0000 (Mon, 28 Mar 2005)
New Revision: 394

Modified:
   packages/libxslt/trunk/debian/changelog
   packages/libxslt/trunk/debian/rules
Log:
Better installation of python packages' files

Modified: packages/libxslt/trunk/debian/changelog
===================================================================
--- packages/libxslt/trunk/debian/changelog	2005-03-28 17:04:46 UTC (rev 393)
+++ packages/libxslt/trunk/debian/changelog	2005-03-28 17:19:34 UTC (rev 394)
@@ -1,3 +1,11 @@
+libxslt (1.1.12-8) unstable; urgency=low
+
+  * The "Let's do it cleaner" release.
+  * debian/rules: fix installation of python files and make proper use of
+    DESTDIR at install time.
+
+ -- Mike Hommey <glandium@debian.org>  Mon, 28 Mar 2005 19:04:55 +0200
+
 libxslt (1.1.12-7) unstable; urgency=low
 
   * debian/watch: use svn-upgrade instead of uupdate.

Modified: packages/libxslt/trunk/debian/rules
===================================================================
--- packages/libxslt/trunk/debian/rules	2005-03-28 17:04:46 UTC (rev 393)
+++ packages/libxslt/trunk/debian/rules	2005-03-28 17:19:34 UTC (rev 394)
@@ -98,7 +98,7 @@
 
 	mv -f python/Makefile python/Makefile.bak
 	echo install: > python/Makefile
-	$(MAKE) prefix=$(PWD)/$(TMP_DIR)/usr install
+	$(MAKE) DESTDIR=$(PWD)/$(TMP_DIR) install
 	mv -f python/Makefile.bak python/Makefile
 
 	# Properly install documentation in /usr/share/doc/libxslt1-dev
@@ -125,13 +125,13 @@
 	done
 
 build-python%-stamp: build-stamp
-	cd python && $(MAKE) clean && $(MAKE) PYTHON=/usr/bin/python$* pythondir=`pwd`/../debian/tmp/usr/lib/python$*/site-packages PYTHON_VERSION=$* PYTHON_INCLUDES=/usr/include/python$*
+	cd python && $(MAKE) clean && $(MAKE) PYTHON=/usr/bin/python$* PYTHON_VERSION=$* PYTHON_INCLUDES=/usr/include/python$*
 	
 	touch $@
 
 install-python%-stamp: build-python%-stamp
 	rm build-python$*-stamp
-	cd python && $(MAKE) PYTHON=/usr/bin/python$* pythondir=`pwd`/../debian/tmp/usr/lib/python$*/site-packages PYTHON_VERSION=$* PYTHON_INCLUDES=/usr/include/python$* install
+	cd python && $(MAKE) DESTDIR=`pwd`/../debian/tmp PYTHON=/usr/bin/python$* PYTHON_VERSION=$* PYTHON_INCLUDES=/usr/include/python$* install
 
 	sed s/PYVERS/$*/ debian/python-libxslt1.install.in > debian/python$*-libxslt1.install
 	cp debian/python-libxslt1.examples.in debian/python$*-libxslt1.examples