]> xenbits.xensource.com Git - people/liuw/xtf.git/commitdiff
build: Fix the install rule for configuration files
authorAndrew Cooper <andrew.cooper3@citrix.com>
Tue, 2 Aug 2016 18:43:12 +0000 (19:43 +0100)
committerAndrew Cooper <andrew.cooper3@citrix.com>
Tue, 2 Aug 2016 18:43:12 +0000 (19:43 +0100)
install-$(env) should only depend on the $(env) subset of all configuration
files, and all configuration files should be installed, rather than just the
first listed.

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
build/gen.mk

index c9ff6962e17b1b64e2af3eb4d3ea53891a4c47f6..55fc39d009bea783834ceab2085a78631818e342 100644 (file)
@@ -78,9 +78,9 @@ install-$(1): test-$(1)-$(NAME)
        @$(INSTALL_DIR) $(DESTDIR)$(xtftestdir)/$(NAME)
        $(INSTALL_PROGRAM) $$< $(DESTDIR)$(xtftestdir)/$(NAME)
 
-install-$(1).cfg: $(TEST-CFGS)
+install-$(1).cfg: $(filter test-$(1)-%,$(TEST-CFGS))
        @$(INSTALL_DIR) $(DESTDIR)$(xtftestdir)/$(NAME)
-       $(INSTALL_DATA) $$< $(DESTDIR)$(xtftestdir)/$(NAME)
+       $(INSTALL_DATA) $$^ $(DESTDIR)$(xtftestdir)/$(NAME)
 
 install-each-env: install-$(1) install-$(1).cfg