[linux-tools] 01/05: Makefile.inc: Add support for wildcards in $(SCRIPTS) and $(DATA)

[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 6ace6a80c11334d4af4d34444d280a07f59ac67c
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Mon Feb 22 23:20:34 2016 +0000

    Makefile.inc: Add support for wildcards in $(SCRIPTS) and $(DATA)
    
    This can't be done for $(PROGS) as by definition those don't exist
    until we build them.
---
 debian/changelog            | 6 ++++++
 debian/rules.d/Makefile.inc | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 97a5554..ed0ba6b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+linux-tools (4.5~rc5-1~exp4) UNRELEASED; urgency=medium
+
+  * Makefile.inc: Add support for wildcards in $(SCRIPTS) and $(DATA)
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Mon, 22 Feb 2016 23:21:57 +0000
+
 linux-tools (4.5~rc5-1~exp3) experimental; urgency=medium
 
   * Adjust build fix from unstable
diff --git a/debian/rules.d/Makefile.inc b/debian/rules.d/Makefile.inc
index a79e85b..b7c8dd2 100644
--- a/debian/rules.d/Makefile.inc
+++ b/debian/rules.d/Makefile.inc
@@ -36,7 +36,7 @@ install-local-progs: $(PROGS)
 	  install -D -m755 "$$p" "$(prefix)/$(OUTDIR)/$$(basename $$p)"; \
 	done
 
-SCRIPTS_REAL = $(addprefix $(top_srcdir)/$(OUTDIR)/,$(SCRIPTS))
+SCRIPTS_REAL = $(wildcard $(addprefix $(top_srcdir)/$(OUTDIR)/,$(SCRIPTS)))
 
 install-local-scripts: $(SCRIPTS_REAL)
 	@for p in $^; do \
@@ -44,7 +44,7 @@ install-local-scripts: $(SCRIPTS_REAL)
 	  install -D -m755 "$$p" "$(prefix)/$(OUTDIR)/$$(basename $$p)"; \
 	done
 
-DATA_REAL = $(addprefix $(top_srcdir)/$(OUTDIR)/,$(DATA))
+DATA_REAL = $(wildcard $(addprefix $(top_srcdir)/$(OUTDIR)/,$(DATA)))
 
 install-local-data: $(DATA_REAL)
 	@for p in $^; do \

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