[linux-tools] 05/05: hyperv-daemons: Fix rule redefinition that 'make' warns about

[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 910e14869d5b281c187a9ce358abbd00d012498b
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Mon Feb 22 23:58:52 2016 +0000

    hyperv-daemons: Fix rule redefinition that 'make' warns about
---
 debian/changelog                 |  1 +
 debian/rules.d/tools/hv/Makefile | 11 ++++-------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index babd047..6300cc3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,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)
+  * hyperv-daemons: Fix rule redefinition that 'make' warns about
 
  -- Ben Hutchings <ben at decadent.org.uk>  Mon, 22 Feb 2016 23:21:57 +0000
 
diff --git a/debian/rules.d/tools/hv/Makefile b/debian/rules.d/tools/hv/Makefile
index 6e59751..13315da 100644
--- a/debian/rules.d/tools/hv/Makefile
+++ b/debian/rules.d/tools/hv/Makefile
@@ -8,18 +8,15 @@ else
 PROGS = \
 	hv_fcopy_daemon \
 	hv_kvp_daemon \
-	hv_vss_daemon \
-	check-hyperv
+	hv_vss_daemon
 
 prefix = /usr/sbin
 
 include $(top_rulesdir)/Makefile.inc
 
-install-local-progs: $(PROGS)
-	@for p in $(filter-out check-hyperv,$^); do \
-	  echo " install -m755 '$$p' '$(DESTDIR)/$(prefix)'"; \
-	  install -D -m755 "$$p" "$(DESTDIR)/$(prefix)/$$(basename $$p)"; \
-	done
+# Handle check-hyperv separately since it's installed in a different directory
+all-local: check-hyperv
+install-local:
 	install -D -m755 check-hyperv '$(DESTDIR)/lib/hyperv-daemons/check-hyperv'
 
 endif

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