[Piuparts-commits] [SCM] piuparts git repository branch, piatti, updated. 0.49-105-gac1319a

[Andreas Beckmann]

The following commit has been merged in the piatti branch:
commit 12f03fd7eee882c3681bc3bafca3221ae0324266
Author: Andreas Beckmann <anbe at debian.org>
Date:   Wed Feb 20 17:01:00 2013 +0100

    set 'prefix' and 'DESTDIR' for build and install targets
    
    Signed-off-by: Andreas Beckmann <anbe at debian.org>

diff --git a/debian/changelog b/debian/changelog
index 0f9e469..f3faaa0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,6 +26,7 @@ piuparts (0.50) UNRELEASED; urgency=low
   * Makefile:
     - Add DESTDIR support.
     - Perform syntax check on *.py before installation.
+  * debian/rules: Set 'prefix' and 'DESTDIR' for build and install.
   * pre_install_exceptions: Handle bootcd-ia64 installation in squeeze.
   * post_distupgrade_exceptions: Handle libdb4.8 removal in wheezy.
   * pre_remove_50_find_bad_permissions: Add some exceptions.
diff --git a/debian/rules b/debian/rules
index 6d223a2..fa10352 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,13 +8,13 @@
 
 
 override_dh_auto_build:
-	$(MAKE) build build-doc
+	$(MAKE) prefix=/usr build build-doc
 
 override_dh_auto_test:
 	echo "unittests are disabled as they haven't been run at build time since years and thus are broken..."
 
 override_dh_auto_install:
-	$(MAKE) prefix=$(CURDIR)/debian/tmp/usr etcdir=$(CURDIR)/debian/tmp/etc install install-doc install-conf
+	$(MAKE) DESTDIR=$(CURDIR)/debian/tmp prefix=/usr etcdir=/etc install install-doc install-conf
 
 override_dh_python2:
 	dh_python2 -p piuparts-master -p piuparts-slave /usr/share/piuparts
diff --git a/update-piuparts-setup b/update-piuparts-setup
index 0051e97..f3124de 100755
--- a/update-piuparts-setup
+++ b/update-piuparts-setup
@@ -72,7 +72,8 @@ fi
 #
 # install everything from GIT into PIUPARTS_PREFIX
 #
-make build build-doc
+make		prefix=$PIUPARTS_PREFIX \
+		build build-doc
 sudo make	prefix=$PIUPARTS_PREFIX \
 		docdir=$PIUPARTS_HTDOCS/doc \
 		htdocsdir=$PIUPARTS_HTDOCS \

-- 
piuparts git repository