[Piuparts-commits] [SCM] piuparts git repository branch, develop, updated. 0.45-6-g04a79d5

[Andreas Beckmann]

The following commit has been merged in the develop branch:
commit 861710a8864014d628aab2096974b0feed8111e2
Author: Andreas Beckmann <debian at abeckmann.de>
Date:   Fri Jun 22 06:21:57 2012 +0200

    Makefile: introduce htdocsdir as overridable destination
    
    create links to tango icons while installing htdocsdir/images
    
    Signed-off-by: Andreas Beckmann <debian at abeckmann.de>

diff --git a/Makefile b/Makefile
index 6cee024..cef3903 100644
--- a/Makefile
+++ b/Makefile
@@ -8,6 +8,7 @@ docdir = $(prefix)/share/doc/piuparts/
 svrdocdir = $(prefix)/share/doc/piuparts-master
 site26 = $(libdir)/python2.6/dist-packages
 site27 = $(libdir)/python2.7/dist-packages
+htdocsdir	 = $(sharedir)/piuparts/htdocs
 etcdir = $(prefix)/etc
 distribution=${shell dpkg-parsechangelog | sed -n 's/^Distribution: *//p'}
 ifeq ($(distribution),UNRELEASED)
@@ -86,20 +87,22 @@ install:
 
 	cp -r home/piupartss/bin/* $(sharedir)/piuparts/slave
 
-	install -d $(sharedir)/piuparts/htdocs
+	install -d $(DESTDIR)$(htdocsdir)
 	for file in org/piuparts.debian.org/htdocs/* ; do\
             if [ -f $$file ] ; then \
-                install -m 0644 $$file $(sharedir)/piuparts/htdocs ;\
+                install -m 0644 $$file $(DESTDIR)$(htdocsdir) ;\
             fi \
         done
 
-	install -d $(sharedir)/piuparts/htdocs/images
-	install -m 0644 org/piuparts.debian.org/htdocs/images/* $(sharedir)/piuparts/htdocs/images
+	install -d $(DESTDIR)$(htdocsdir)/images
+	install -m 0644 org/piuparts.debian.org/htdocs/images/* $(DESTDIR)$(htdocsdir)/images/
+	ln -sf /usr/share/icons/Tango/24x24/status/sunny.png $(DESTDIR)$(htdocsdir)/images/sunny.png
+	ln -sf /usr/share/icons/Tango/24x24/status/weather-severe-alert.png $(DESTDIR)$(htdocsdir)/images/weather-severe-alert.png
 
-	install -d $(sharedir)/piuparts/htdocs/templates/mail
+	install -d $(DESTDIR)$(htdocsdir)/templates/mail
 	for file in org/piuparts.debian.org/htdocs/templates/mail/* ; do\
 		if [ -f $$file ] ; then \
-			install -m 0644 $$file $(sharedir)/piuparts/htdocs/templates/mail ;\
+			install -m 0644 $$file $(DESTDIR)$(htdocsdir)/templates/mail ;\
 		fi \
 	done
 
diff --git a/debian/piuparts-master.links b/debian/piuparts-master.links
deleted file mode 100644
index cf1cf23..0000000
--- a/debian/piuparts-master.links
+++ /dev/null
@@ -1,2 +0,0 @@
-/usr/share/icons/Tango/24x24/status/sunny.png /usr/share/piuparts/htdocs/images/sunny.png
-/usr/share/icons/Tango/24x24/status/weather-severe-alert.png /usr/share/piuparts/htdocs/images/weather-severe-alert.png

-- 
piuparts git repository