[linux] 01/01: linux-headers: Avoid mixed implicit and normal rules in Makefile

[debian-kernel at lists.debian.org]

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

benh pushed a commit to branch jessie
in repository linux.

commit 2a3c3c09c575562b7148c048ff34232d9f25fe01
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Thu Apr 28 14:08:54 2016 +0200

    linux-headers: Avoid mixed implicit and normal rules in Makefile
    
    Thanks to Thierry Herbelot; closes: #822666
    
    (cherry picked from commit 9fa5f38a4076c76c56365b297475f59a5fa80d35)
    
    Conflicts:
    	debian/changelog
---
 debian/changelog  | 2 ++
 debian/rules.real | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 5e8b732..ed16a12 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 linux (3.16.7-ckt25-3) UNRELEASED; urgency=medium
 
   * [amd64] KVM: bit-ops emulation ignores offset on 64-bit (Closes: #818502)
+  * linux-headers: Avoid mixed implicit and normal rules in Makefile, thanks to
+    Thierry Herbelot (Closes: #822666)
 
  -- Ben Hutchings <ben at decadent.org.uk>  Sat, 30 Apr 2016 22:07:22 +0200
 
diff --git a/debian/rules.real b/debian/rules.real
index 99e8fb9..12f7eb8 100644
--- a/debian/rules.real
+++ b/debian/rules.real
@@ -285,7 +285,9 @@ install-headers_$(ARCH)_$(FEATURESET)_$(FLAVOUR): $(STAMPS_DIR)/build_$(ARCH)_$(
 	@echo 'all:' >> $(DIR)/Makefile
 	@echo '	@$$(MAKE) $$(MAKEARGS) $$(cmd)' >> $(DIR)/Makefile
 	@echo 'Makefile:;' >> $(DIR)/Makefile
-	@echo '$$(cmd) %/: all' >> $(DIR)/Makefile
+	@echo '$$(cmd): all' >> $(DIR)/Makefile
+	@echo '	@:' >> $(DIR)/Makefile
+	@echo '%/: all' >> $(DIR)/Makefile
 	@echo '	@:' >> $(DIR)/Makefile
 
 	dh_link /usr/lib/$(PACKAGE_NAME_KBUILD)/scripts $(BASE_DIR)/scripts

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