[devscripts] 01/03: Consistently use PREFIX (and similar) Makefile variables

[James McCoy]

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

jamessan pushed a commit to branch master
in repository devscripts.

commit 5d511ece58d80bb2d2bac1c129298f4178a3ecee
Author: Peter Eisenstraut <petere at debian.org>
Date:   Sun Nov 3 09:39:00 2013 -0500

    Consistently use PREFIX (and similar) Makefile variables
    
    Some parts of the makefiles support setting the PREFIX variable and
    other variables to control the installation layout, but this is not
    consistently done.
    
    This change implements such consistency, which is useful to allow test
    installations etc.
    
    Signed-off-by: James McCoy <jamessan at debian.org>
---
 Makefile         |  4 ----
 Makefile.common  | 11 ++++++++---
 debian/changelog |  4 ++++
 scripts/Makefile | 12 ++++--------
 4 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/Makefile b/Makefile
index 0a11b0a..8af5046 100644
--- a/Makefile
+++ b/Makefile
@@ -7,10 +7,6 @@ DESTDIR =
 PERL_MODULES = Devscripts
 EXAMPLES = conf.default README.mk-build-deps
 
-PREFIX ?= /usr
-DOCDIR ?= $(PREFIX)/share/doc/devscripts
-MAN1DIR ?= $(PREFIX)/share/man/man1
-
 all: version make_scripts $(EXAMPLES) translated_manpages
 
 version:
diff --git a/Makefile.common b/Makefile.common
index 3400687..0f500d2 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -3,6 +3,11 @@ GEN_MAN1S := bts.1 build-rdeps.1 chdist.1 dcontrol.1 debcheckout.1 debcommit.1 \
 	     mk-build-deps.1 mk-origtargz.1 namecheck.1 rmadison.1 sadt.1 svnpath.1 \
 	     tagpending.1 origtargz.1 transition-check.1 who-permits-upload.1
 
-PERLMOD_DIR = /usr/share/devscripts
-EXAMPLES_DIR = /usr/share/devscripts
-
+PREFIX = /usr
+BINDIR = $(PREFIX)/bin
+PKGLIBDIR = $(PREFIX)/lib/devscripts
+DOCDIR = $(PREFIX)/share/doc/devscripts
+MAN1DIR = $(PREFIX)/share/man/man1
+PERLMOD_DIR = $(PREFIX)/share/devscripts
+EXAMPLES_DIR = $(PREFIX)/share/devscripts
+SYSCONFDIR = /etc
diff --git a/debian/changelog b/debian/changelog
index 05f3d58..506299a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -64,6 +64,10 @@ devscripts (2.15.1+exp1) UNRELEASED; urgency=medium
   * Add bash completion for dch, debsign, and uupdate.  (Closes: #774544,
     #778963, #779279)
 
+  [ Peter Eisenstraut ]
+  * Consistently use Makefile variables to control the installation layout.
+    (Closes: #728607)
+
  -- James McCoy <jamessan at debian.org>  Sat, 03 Jan 2015 00:47:36 -0500
 
 devscripts (2.15.1) unstable; urgency=medium
diff --git a/scripts/Makefile b/scripts/Makefile
index 01aa944..7ddc794 100644
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -24,10 +24,6 @@ COMPLETION = $(patsubst %.bash_completion,devscripts.%,$(COMPL_FILES))
 
 GEN_MAN1S += devscripts.1 mk-origtargz.1
 
-BINDIR = /usr/bin
-LIBDIR = /usr/lib/devscripts
-BIN_LIBDIR = /usr/lib/devscripts
-
 all: $(SCRIPTS) $(GEN_MAN1S) $(LIBS) $(CWRAPPERS) $(COMPLETION)
 
 $(VERSION_FILE):
@@ -96,12 +92,12 @@ test:
 
 install: all
 	python3 setup.py install --root="$(DESTDIR)" --no-compile --install-layout=deb
-	install -dD $(DESTDIR)$(BINDIR) $(DESTDIR)$(LIBDIR)
+	install -dD $(DESTDIR)$(BINDIR) $(DESTDIR)$(PKGLIBDIR)
 	cp $(SCRIPTS) $(DESTDIR)$(BINDIR)
 	ln -sf edit-patch $(DESTDIR)$(BINDIR)/add-patch
-	cp $(LIBS) $(DESTDIR)$(LIBDIR)
-	install -dD $(DESTDIR)/etc/bash_completion.d
-	cp $(COMPLETION) $(DESTDIR)/etc/bash_completion.d
+	cp $(LIBS) $(DESTDIR)$(PKGLIBDIR)
+	install -dD $(DESTDIR)$(SYSCONFDIR)/bash_completion.d
+	cp $(COMPLETION) $(DESTDIR)$(SYSCONFDIR)/bash_completion.d
 	# Special treatment for debpkg
 	install -dD $(DESTDIR)$(PERLMOD_DIR)
 	mv $(DESTDIR)$(BINDIR)/debpkg $(DESTDIR)$(PERLMOD_DIR)

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