[Piuparts-commits] [piuparts] 05/05: install debiman-piuparts-distill into $(libdir)/piuparts/

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch develop
in repository piuparts.

commit 20102f143589aa2a88bc36971b1e48e118a30f6e
Author: Andreas Beckmann <anbe at debian.org>
Date:   Sun Aug 6 04:54:17 2017 +0200

    install debiman-piuparts-distill into $(libdir)/piuparts/
    
    Signed-off-by: Andreas Beckmann <anbe at debian.org>
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 Makefile                               |  6 ++++--
 debian/piuparts-common.install         |  2 +-
 debian/piuparts-master.install         |  2 +-
 master-bin/distill_alternatives_log.in | 11 ++++++-----
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index e4ed906..cbcc556 100644
--- a/Makefile
+++ b/Makefile
@@ -29,6 +29,7 @@ define placeholder_substitution
 	sed -r \
 	-e 's/__PIUPARTS_VERSION__/$(version)/g' \
 	-e 's%@sharedir@%$(sharedir)%g' \
+	-e 's%@libdir@%$(libdir)%g' \
 	$< > $@
 endef
 
@@ -122,8 +123,8 @@ install-common: build-stamp
 	install -m 0644 lib/*.sh $(DESTDIR)$(sharedir)/piuparts/lib/
 
 install-master: build-master-stamp install-common
-	install -d $(DESTDIR)$(sbindir)/
-	install -m 0755 debiman-piuparts-distill/debiman-piuparts-distill $(DESTDIR)$(sbindir)/
+	install -d $(DESTDIR)$(libdir)/piuparts/
+	install -m 0755 debiman-piuparts-distill/debiman-piuparts-distill $(DESTDIR)$(libdir)/piuparts/
 
 	install -d $(DESTDIR)$(sharedir)/piuparts
 	install -m 0755 piuparts-master piuparts-master-backend piuparts-report piuparts-analyze $(DESTDIR)$(sharedir)/piuparts/
@@ -177,6 +178,7 @@ clean:
 	rm -f piuparts.1.xml README.xml README_server.xml docbook-xsl.css piuparts.html
 	rm -f *.pyc piupartslib/*.pyc master-bin/*.pyc slave-bin/*.pyc tests/*.pyc
 	rm -f $(SCRIPTS_GENERATED)
+	$(RM) debiman-piuparts-distill/debiman-piuparts-distill
 	$(MAKE) -C instances clean
 
 
diff --git a/debian/piuparts-common.install b/debian/piuparts-common.install
index 3b9c71a..418e8d2 100644
--- a/debian/piuparts-common.install
+++ b/debian/piuparts-common.install
@@ -1,3 +1,3 @@
 etc/piuparts/distros.conf
-usr/lib/*
+usr/lib/python2.7/*
 usr/share/piuparts/lib/*
diff --git a/debian/piuparts-master.install b/debian/piuparts-master.install
index c5cb009..42f93ed 100644
--- a/debian/piuparts-master.install
+++ b/debian/piuparts-master.install
@@ -7,4 +7,4 @@ usr/share/piuparts/piuparts-analyze
 usr/share/piuparts/piuparts-master
 usr/share/piuparts/piuparts-master-backend
 usr/share/piuparts/piuparts-report
-usr/sbin/debiman-piuparts-distill
+usr/lib/piuparts/debiman-piuparts-distill
diff --git a/master-bin/distill_alternatives_log.in b/master-bin/distill_alternatives_log.in
index f475748..4745008 100644
--- a/master-bin/distill_alternatives_log.in
+++ b/master-bin/distill_alternatives_log.in
@@ -1,23 +1,24 @@
-#!/bin/bash
+#!/bin/sh
 set -e
 
 . @sharedir@/piuparts/lib/read_config.sh
+
 get_config_value HTDOCS global output-directory
 
 mkdir -p ${HTDOCS}/for-manpages.d.o
 
-debiman-piuparts-distill \
+ at libdir@/debiman-piuparts-distill \
   -logs_dir=${HTDOCS}/experimental \
   -output=${HTDOCS}/for-manpages.d.o/experimental.json.gz
 
-debiman-piuparts-distill \
+ at libdir@/debiman-piuparts-distill \
   -logs_dir=${HTDOCS}/sid \
   -output=${HTDOCS}/for-manpages.d.o/unstable.json.gz
 
-debiman-piuparts-distill \
+ at libdir@/debiman-piuparts-distill \
   -logs_dir=${HTDOCS}/stretch \
   -output=${HTDOCS}/for-manpages.d.o/testing.json.gz
 
-debiman-piuparts-distill \
+ at libdir@/debiman-piuparts-distill \
   -logs_dir=${HTDOCS}/jessie \
   -output=${HTDOCS}/for-manpages.d.o/stable.json.gz

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/piuparts/piuparts.git