[linux-tools] 04/05: Makefile.inc, rules.real: Fix conflation of $(DESTDIR) and $(prefix)

[debian-kernel at lists.debian.org]

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

benh pushed a commit to branch master
in repository linux-tools.

commit 014aa495112276cd40a450b9f9b90e6346b39d8c
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Mon Feb 22 23:39:54 2016 +0000

    Makefile.inc, rules.real: Fix conflation of $(DESTDIR) and $(prefix)
---
 debian/changelog            |  1 +
 debian/rules.d/Makefile.inc | 12 ++++++------
 debian/rules.real           |  8 ++++----
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 692c257..babd047 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ linux-tools (4.5~rc5-1~exp4) UNRELEASED; urgency=medium
 
   * Makefile.inc: Add support for wildcards in $(SCRIPTS) and $(DATA)
   * linux-kbuild: Include scripts/Makefile.* (Closes: #815593)
+  * Makefile.inc, rules.real: Fix conflation of $(DESTDIR) and $(prefix)
 
  -- Ben Hutchings <ben at decadent.org.uk>  Mon, 22 Feb 2016 23:21:57 +0000
 
diff --git a/debian/rules.d/Makefile.inc b/debian/rules.d/Makefile.inc
index b7c8dd2..48194af 100644
--- a/debian/rules.d/Makefile.inc
+++ b/debian/rules.d/Makefile.inc
@@ -32,23 +32,23 @@ install-local: install-local-progs install-local-scripts install-local-data
 
 install-local-progs: $(PROGS)
 	@for p in $^; do \
-	  echo " install -m755 '$$p' '$(prefix)/$(OUTDIR)'"; \
-	  install -D -m755 "$$p" "$(prefix)/$(OUTDIR)/$$(basename $$p)"; \
+	  echo " install -m755 '$$p' '$(DESTDIR)/$(prefix)/$(OUTDIR)'"; \
+	  install -D -m755 "$$p" "$(DESTDIR)/$(prefix)/$(OUTDIR)/$$(basename $$p)"; \
 	done
 
 SCRIPTS_REAL = $(wildcard $(addprefix $(top_srcdir)/$(OUTDIR)/,$(SCRIPTS)))
 
 install-local-scripts: $(SCRIPTS_REAL)
 	@for p in $^; do \
-	  echo " install -m755 '$$p' '$(prefix)/$(OUTDIR)'"; \
-	  install -D -m755 "$$p" "$(prefix)/$(OUTDIR)/$$(basename $$p)"; \
+	  echo " install -m755 '$$p' '$(DESTDIR)/$(prefix)/$(OUTDIR)'"; \
+	  install -D -m755 "$$p" "$(DESTDIR)/$(prefix)/$(OUTDIR)/$$(basename $$p)"; \
 	done
 
 DATA_REAL = $(wildcard $(addprefix $(top_srcdir)/$(OUTDIR)/,$(DATA)))
 
 install-local-data: $(DATA_REAL)
 	@for p in $^; do \
-	  echo " install -m644 '$$p' '$(prefix)/$(OUTDIR)'"; \
-	  install -D -m644 "$$p" "$(prefix)/$(OUTDIR)/$$(basename $$p)"; \
+	  echo " install -m644 '$$p' '$(DESTDIR)/$(prefix)/$(OUTDIR)'"; \
+	  install -D -m644 "$$p" "$(DESTDIR)/$(prefix)/$(OUTDIR)/$$(basename $$p)"; \
 	done
 
diff --git a/debian/rules.real b/debian/rules.real
index adf4520..08391ba 100644
--- a/debian/rules.real
+++ b/debian/rules.real
@@ -28,14 +28,14 @@ $(STAMPS_DIR)/build:
 
 install-kbuild: PACKAGE_NAME = linux-kbuild-$(VERSION)
 install-kbuild: DH_OPTIONS = -p$(PACKAGE_NAME)
-install-kbuild: BASE_DIR = /usr/lib/$(PACKAGE_NAME)
-install-kbuild: DIR = $(CURDIR)/debian/$(PACKAGE_NAME)/$(BASE_DIR)
+install-kbuild: PREFIX_DIR = /usr/lib/$(PACKAGE_NAME)
+install-kbuild: DIR = $(CURDIR)/debian/$(PACKAGE_NAME)
 install-kbuild: $(STAMPS_DIR)/build
 	dh_testdir
 	dh_testroot
 	dh_prep
-	$(call submake,scripts) install prefix=$(DIR)
-	dh_link $(BASE_DIR) /usr/src/$(PACKAGE_NAME)
+	$(call submake,scripts) install DESTDIR=$(DIR) prefix=$(PREFIX_DIR)
+	dh_link $(PREFIX_DIR) /usr/src/$(PACKAGE_NAME)
 	dh_installchangelogs
 	dh_installdocs
 	dh_strip

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