[linux-tools] 01/01: Fix setting of installation directory for tools/hv

[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 a5f3e6ab8c5293cb6f2e0390e20d655b8ecee437
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Tue Feb 23 00:54:38 2016 +0000

    Fix setting of installation directory for tools/hv
    
    Add installdir variable that defaults to $(prefix)/$(OUTDIR) as used
    in scripts/, but can be set directly in tools/hv which doesn't want
    to mirror the source hierarchy.
---
 debian/rules.d/Makefile.inc      | 14 ++++++++------
 debian/rules.d/tools/hv/Makefile |  2 +-
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/debian/rules.d/Makefile.inc b/debian/rules.d/Makefile.inc
index 48194af..3da8eae 100644
--- a/debian/rules.d/Makefile.inc
+++ b/debian/rules.d/Makefile.inc
@@ -14,6 +14,8 @@ CPPFLAGS := $(shell dpkg-buildflags --get CPPFLAGS) \
 CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) -Wall
 LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS)
 
+installdir ?= $(prefix)/$(OUTDIR)
+
 all: all-local all-recursive
 clean: clean-recursive
 install: install-local install-recursive
@@ -32,23 +34,23 @@ install-local: install-local-progs install-local-scripts install-local-data
 
 install-local-progs: $(PROGS)
 	@for p in $^; do \
-	  echo " install -m755 '$$p' '$(DESTDIR)/$(prefix)/$(OUTDIR)'"; \
-	  install -D -m755 "$$p" "$(DESTDIR)/$(prefix)/$(OUTDIR)/$$(basename $$p)"; \
+	  echo " install -m755 '$$p' '$(DESTDIR)/$(installdir)'"; \
+	  install -D -m755 "$$p" "$(DESTDIR)/$(installdir)/$$(basename $$p)"; \
 	done
 
 SCRIPTS_REAL = $(wildcard $(addprefix $(top_srcdir)/$(OUTDIR)/,$(SCRIPTS)))
 
 install-local-scripts: $(SCRIPTS_REAL)
 	@for p in $^; do \
-	  echo " install -m755 '$$p' '$(DESTDIR)/$(prefix)/$(OUTDIR)'"; \
-	  install -D -m755 "$$p" "$(DESTDIR)/$(prefix)/$(OUTDIR)/$$(basename $$p)"; \
+	  echo " install -m755 '$$p' '$(DESTDIR)/$(installdir)'"; \
+	  install -D -m755 "$$p" "$(DESTDIR)/$(installdir)/$$(basename $$p)"; \
 	done
 
 DATA_REAL = $(wildcard $(addprefix $(top_srcdir)/$(OUTDIR)/,$(DATA)))
 
 install-local-data: $(DATA_REAL)
 	@for p in $^; do \
-	  echo " install -m644 '$$p' '$(DESTDIR)/$(prefix)/$(OUTDIR)'"; \
-	  install -D -m644 "$$p" "$(DESTDIR)/$(prefix)/$(OUTDIR)/$$(basename $$p)"; \
+	  echo " install -m644 '$$p' '$(DESTDIR)/$(installdir)'"; \
+	  install -D -m644 "$$p" "$(DESTDIR)/$(installdir)/$$(basename $$p)"; \
 	done
 
diff --git a/debian/rules.d/tools/hv/Makefile b/debian/rules.d/tools/hv/Makefile
index 13315da..339a8b1 100644
--- a/debian/rules.d/tools/hv/Makefile
+++ b/debian/rules.d/tools/hv/Makefile
@@ -10,7 +10,7 @@ PROGS = \
 	hv_kvp_daemon \
 	hv_vss_daemon
 
-prefix = /usr/sbin
+installdir = /usr/sbin
 
 include $(top_rulesdir)/Makefile.inc
 

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