From e52c3c7807caea8d9e5adccd51530913cfae9ad7 Mon Sep 17 00:00:00 2001
From: Nathan Scott <nathans@redhat.com>
Date: Mon, 29 Feb 2016 14:31:43 +1100
Subject: [PATCH] qa: add testsuite makefiles needed for archives/multi
 packaging

---
 qa/archives/GNUmakefile               |  7 +++++--
 qa/archives/GNUmakefile.install       |  5 ++++-
 qa/archives/multi/GNUmakefile         | 17 +++++++++++++++++
 qa/archives/multi/GNUmakefile.install |  1 +
 4 files changed, 27 insertions(+), 3 deletions(-)
 create mode 100644 qa/archives/multi/GNUmakefile
 create mode 100644 qa/archives/multi/GNUmakefile.install

diff --git a/qa/archives/GNUmakefile b/qa/archives/GNUmakefile
index bd07895ab..8447d5aa3 100644
--- a/qa/archives/GNUmakefile
+++ b/qa/archives/GNUmakefile
@@ -10,6 +10,7 @@ TOPDIR = ../..
 include $(TOPDIR)/src/include/builddefs
 
 TESTDIR = $(PCP_VAR_DIR)/testsuite/archives
+SUBDIRS = multi
 
 # first the special and odd ones
 #
@@ -44,9 +45,10 @@ OTHERS = ds390-access.gz collectl-qa small.0.xz small.meta small.index \
 
 LDIRT = pmlogger.log
 
-default default_pcp setup:
+default default_pcp setup: $(SUBDIRS)
+	$(SUBDIRS_MAKERULE)
 
-install install_pcp:
+install install_pcp: $(SUBDIRS)
 	$(INSTALL) -m 755 -d $(TESTDIR)
 	$(INSTALL) -m 755 $(SCRIPTS) $(TESTDIR)
 	$(INSTALL) -m 644 GNUmakefile.install $(TESTDIR)/GNUmakefile
@@ -54,6 +56,7 @@ install install_pcp:
 	$(INSTALL) -m 644 $(SRCMETA) $(SRCOTHER) $(TESTDIR)
 	$(INSTALL) -m 644 $(SRCIDX) $(TESTDIR)
 	$(INSTALL) -m 644 $(OTHERS) $(CONFIGS) $(FOLIOS) $(TESTDIR)
+	$(SUBDIRS_MAKERULE)
 
 include $(BUILDRULES)
 
diff --git a/qa/archives/GNUmakefile.install b/qa/archives/GNUmakefile.install
index 4f1c1003f..2a5f64eff 100644
--- a/qa/archives/GNUmakefile.install
+++ b/qa/archives/GNUmakefile.install
@@ -6,8 +6,11 @@ endif
 PATH    = $(shell . $(PCP_DIR)/etc/pcp.env; echo $$PATH)
 include $(PCP_INC_DIR)/builddefs
 
+SUBDIRS = multi
+
 LDIRT = pmlogger.log
 
-default setup install:
+default setup install: $(SUBDIRS)
+	$(SUBDIRS_MAKERULE)
 
 include $(BUILDRULES)
diff --git a/qa/archives/multi/GNUmakefile b/qa/archives/multi/GNUmakefile
new file mode 100644
index 000000000..7597c1f0b
--- /dev/null
+++ b/qa/archives/multi/GNUmakefile
@@ -0,0 +1,17 @@
+TOPDIR = ../../..
+include $(TOPDIR)/src/include/builddefs
+
+TESTDIR = $(PCP_VAR_DIR)/testsuite/archives/multi
+SRCARCH = $(shell echo *.[0-9])
+SRCMETA = $(patsubst %.0,%.meta,$(SRCARCH))
+SRCIDX = $(patsubst %.0,%.index,$(SRCARCH))
+
+default setup default_pcp:
+
+install install_pcp: $(ROOTFILES)
+	$(INSTALL) -m 755 -d $(TESTDIR)
+	$(INSTALL) -m 644 $(SRCARCH) $(SRCMETA) $(SRCIDX) $(TESTDIR)
+	$(INSTALL) -m 644 GNUmakefile.install $(TESTDIR)/GNUmakefile
+
+include $(BUILDRULES)
+
diff --git a/qa/archives/multi/GNUmakefile.install b/qa/archives/multi/GNUmakefile.install
new file mode 100644
index 000000000..5b9d82cdb
--- /dev/null
+++ b/qa/archives/multi/GNUmakefile.install
@@ -0,0 +1 @@
+default setup install clean:
-- 
2.11.4.GIT