From 910e14869d5b281c187a9ce358abbd00d012498b Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Mon, 22 Feb 2016 23:58:52 +0000 Subject: [PATCH] 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 babd0475d..6300cc358 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 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 6e59751ab..13315da4f 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