[Piuparts-commits] [SCM] piuparts git repository branch, develop, updated. 0.49-69-g53033af

[Andreas Beckmann]

The following commit has been merged in the develop branch:
commit 1cfda99d5bcf880e946a7ab99009e3df494f0668
Author: Andreas Beckmann <anbe at debian.org>
Date:   Wed Feb 20 16:55:11 2013 +0100

    Makefile: DESTDIR support for all install* targets
    
    Signed-off-by: Andreas Beckmann <anbe at debian.org>

diff --git a/Makefile b/Makefile
index 6241235..30f1cb7 100644
--- a/Makefile
+++ b/Makefile
@@ -26,29 +26,29 @@ build-doc:
 	a2x --copy -f xhtml piuparts.1.txt
 
 install-doc:
-	install -d $(docdir)/
+	install -d $(DESTDIR)$(docdir)/
 	for file in README.txt README.html docbook-xsl.css ; do \
-	    install -m 0644 $$file $(docdir)/ ; done
-	install -d $(man1dir)
-	install -m 0644 piuparts.1 $(man1dir)
-	gzip -9f $(man1dir)/piuparts.1
-	install -m 0644 piuparts.1.html $(docdir)
+	    install -m 0644 $$file $(DESTDIR)$(docdir)/ ; done
+	install -d $(DESTDIR)$(man1dir)
+	install -m 0644 piuparts.1 $(DESTDIR)$(man1dir)/
+	gzip -9f $(DESTDIR)$(man1dir)/piuparts.1
+	install -m 0644 piuparts.1.html $(DESTDIR)$(docdir)/
 
 install-conf:
-	install -d $(etcdir)/piuparts
-	install -m 0644 conf/piuparts.conf.sample $(etcdir)/piuparts/piuparts.conf
+	install -d $(DESTDIR)$(etcdir)/piuparts
+	install -m 0644 conf/piuparts.conf.sample $(DESTDIR)$(etcdir)/piuparts/piuparts.conf
 
-	install -d $(etcdir)/cron.d
+	install -d $(DESTDIR)$(etcdir)/cron.d
 	install -m 0644 conf/crontab-master $(DESTDIR)$(etcdir)/cron.d/piuparts-master
 	install -m 0644 conf/crontab-slave $(DESTDIR)$(etcdir)/cron.d/piuparts-slave
-	sed -i -r '/^[^#]+/s/^/#/' $(etcdir)/cron.d/piuparts-*
+	sed -i -r '/^[^#]+/s/^/#/' $(DESTDIR)$(etcdir)/cron.d/piuparts-*
 
-	install -d $(etcdir)/sudoers.d
-	install -m 440 conf/piuparts.sudoers $(etcdir)/sudoers.d/piuparts
-	sed -i -r '/^[^#]+/s/^/#/' $(etcdir)/sudoers.d/piuparts
+	install -d $(DESTDIR)$(etcdir)/sudoers.d
+	install -m 440 conf/piuparts.sudoers $(DESTDIR)$(etcdir)/sudoers.d/piuparts
+	sed -i -r '/^[^#]+/s/^/#/' $(DESTDIR)$(etcdir)/sudoers.d/piuparts
 
-	install -d $(etcdir)/apache2/conf.d
-	install -m 0644 conf/piuparts.apache $(etcdir)/apache2/conf.d
+	install -d $(DESTDIR)$(etcdir)/apache2/conf.d
+	install -m 0644 conf/piuparts.apache $(DESTDIR)$(etcdir)/apache2/conf.d/
 
 install-conf-4-running-from-git:
 	install -d $(DESTDIR)$(etcdir)/piuparts
@@ -68,25 +68,24 @@ build: python-syntax-check
 		sed -e 's/__PIUPARTS_VERSION__/$(version)/g' $$file.py > $$file ; done
 
 install:
-	install -d $(sbindir)
-	install -m 0755 piuparts $(DESTDIR)$(sbindir)/piuparts
+	install -d $(DESTDIR)$(sbindir)
+	install -m 0755 piuparts $(DESTDIR)$(sbindir)/
 
-	install -d $(sharedir)/piuparts
-	for file in piuparts-slave piuparts-master piuparts-report piuparts-analyze; do \
-		install -m 0755 $$file $(DESTDIR)$(sharedir)/piuparts/$$file ; done
+	install -d $(DESTDIR)$(sharedir)/piuparts
+	install -m 0755 piuparts-slave piuparts-master piuparts-report piuparts-analyze $(DESTDIR)$(sharedir)/piuparts/
 
-	install -d $(site26)/piupartslib
-	install -d $(site27)/piupartslib
-	install -m 0644 piupartslib/*.py $(site26)/piupartslib
-	install -m 0644 piupartslib/*.py $(site27)/piupartslib
+	install -d $(DESTDIR)$(site26)/piupartslib
+	install -d $(DESTDIR)$(site27)/piupartslib
+	install -m 0644 piupartslib/*.py $(DESTDIR)$(site26)/piupartslib/
+	install -m 0644 piupartslib/*.py $(DESTDIR)$(site27)/piupartslib/
 
-	install -d $(sharedir)/piuparts/master
+	install -d $(DESTDIR)$(sharedir)/piuparts/master
 	install -m 0755 master-bin/* $(DESTDIR)$(sharedir)/piuparts/master
 
 	install -d $(DESTDIR)$(sharedir)/piuparts/master/known_problems
 	install -m 0644 known_problems/*.conf $(DESTDIR)$(sharedir)/piuparts/master/known_problems/
 
-	install -d $(sharedir)/piuparts/slave
+	install -d $(DESTDIR)$(sharedir)/piuparts/slave
 	install -m 0755 slave-bin/* $(DESTDIR)$(sharedir)/piuparts/slave
 
 	install -d $(DESTDIR)$(htdocsdir)
@@ -101,6 +100,7 @@ install:
 	install -m 0644 bug-templates/*.mail $(DESTDIR)$(htdocsdir)/templates/mail/
 
 	install -d $(DESTDIR)$(etcdir)/piuparts
+	@set -e -x ; \
 	for d in $$(ls custom-scripts) ; do \
 		install -d $(DESTDIR)$(etcdir)/piuparts/$$d ; \
 		install -m 0755 custom-scripts/$$d/* $(DESTDIR)$(etcdir)/piuparts/$$d/ ; done
diff --git a/debian/changelog b/debian/changelog
index fbe7427..0f9e469 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,6 +24,7 @@ piuparts (0.50) UNRELEASED; urgency=low
     - Add support for magic "$DISTRO/None" versions.
   * piuparts-report.py:
   * Makefile:
+    - Add DESTDIR support.
     - Perform syntax check on *.py before installation.
   * pre_install_exceptions: Handle bootcd-ia64 installation in squeeze.
   * post_distupgrade_exceptions: Handle libdb4.8 removal in wheezy.

-- 
piuparts git repository