[Piuparts-commits] [SCM] piuparts git repository branch, develop, updated. 0.45-6-g04a79d5
Andreas Beckmann
debian at abeckmann.de
Fri Jun 22 21:38:21 UTC 2012
The following commit has been merged in the develop branch:
commit 8b54c129e92ae4ea028805a0babfab330acb0ec9
Author: Andreas Beckmann <debian at abeckmann.de>
Date: Fri Jun 22 07:06:28 2012 +0200
Makefile: split build rules from install rules
to allow privilege separation between building (as user) and
installing (as root)
adjust debian/rules accordingly
Signed-off-by: Andreas Beckmann <debian at abeckmann.de>
diff --git a/Makefile b/Makefile
index cef3903..ef68c6d 100644
--- a/Makefile
+++ b/Makefile
@@ -5,37 +5,34 @@ mandir = $(sharedir)/man
man1dir = $(mandir)/man1
libdir = $(prefix)/lib
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)
-version=${shell echo "`dpkg-parsechangelog | sed -n 's/^Version: *//p'`~`date +%Y%m%d%H%M`~`git describe --tags --dirty`"}
+version := ${shell echo "`dpkg-parsechangelog | sed -n 's/^Version: *//p'`~`date +%Y%m%d%H%M`~`git describe --dirty`"}
else
-version=${shell dpkg-parsechangelog | sed -n 's/^Version: *//p'}
+version := ${shell dpkg-parsechangelog | sed -n 's/^Version: *//p'}
endif
-ignore = -I fdmount -N
-all: install-conf install-doc install
+all: install install-doc
-install-doc:
- # build and install manual
+build-doc:
a2x --copy -a toc -a toclevels=3 -f xhtml -r /etc/asciidoc/ README.txt
+ a2x -f manpage piuparts.1.txt
+ a2x --copy -f xhtml piuparts.1.txt
+
+install-doc:
install -d $(docdir)/
for file in README.txt README.html docbook-xsl.css ; do \
install -m 0644 $$file $(docdir)/ ; done
- # build and install manpage
- a2x -f manpage piuparts.1.txt
install -d $(man1dir)
install -m 0644 piuparts.1 $(man1dir)
gzip -9f $(man1dir)/piuparts.1
- a2x --copy -f xhtml piuparts.1.txt
install -m 0644 piuparts.1.html $(docdir)
- install -d $(svrdocdir)/
- install -m 0755 README_server.txt $(svrdocdir)/
install-conf:
install -d $(etcdir)/piuparts
@@ -61,17 +58,17 @@ install-conf:
install -d $(etcdir)/piuparts/scripts
install org/piuparts.debian.org/etc/scripts/* $(etcdir)/piuparts/scripts
+build:
+ for file in piuparts piuparts-slave piuparts-master piuparts-report piuparts-analyze; do \
+ sed -e 's/__PIUPARTS_VERSION__/$(version)/g' $$file.py > $$file ; done
+
install:
install -d $(sbindir)
- sed -e 's/__PIUPARTS_VERSION__/$(version)/g' piuparts.py > piuparts
- install piuparts $(sbindir)/piuparts
- rm piuparts
+ install -m 0755 piuparts $(DESTDIR)$(sbindir)/piuparts
install -d $(sharedir)/piuparts
for file in piuparts-slave piuparts-master piuparts-report piuparts-analyze; do \
- sed -e 's/__PIUPARTS_VERSION__/$(version)/g' $$file.py > $$file ; \
- install -m 0755 $$file $(sharedir)/piuparts/$$file ; \
- rm $$file ; done
+ install -m 0755 $$file $(DESTDIR)$(sharedir)/piuparts/$$file ; done
install -d $(site26)/piupartslib
install -d $(site27)/piupartslib
@@ -112,5 +109,6 @@ check:
python unittests.py
clean:
- rm -f piuparts.1 piuparts.1.xml piuparts.1.html piuparts README.xml README.html docbook-xsl.css piuparts.html
+ rm -f piuparts piuparts-slave piuparts-master piuparts-report piuparts-analyze
+ rm -f piuparts.1 piuparts.1.xml piuparts.1.html README.xml README.html docbook-xsl.css piuparts.html
rm -f *.pyc piupartslib/*.pyc
diff --git a/debian/rules b/debian/rules
index d16c254..6d223a2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,13 +8,13 @@
override_dh_auto_build:
- # do nothing
+ $(MAKE) 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 all
+ $(MAKE) prefix=$(CURDIR)/debian/tmp/usr etcdir=$(CURDIR)/debian/tmp/etc install install-doc install-conf
override_dh_python2:
dh_python2 -p piuparts-master -p piuparts-slave /usr/share/piuparts
--
piuparts git repository
More information about the Piuparts-commits
mailing list