xts5: Install test programs to libexec subdirs matching scenarios

In order to keep the scenarios usable in the source tree and while
installed, install the test programs to subdirectories of $(libexecdir)
matching the source tree. This gives, for example,
/usr/libexec/xts5/Xproto/pAllocColor.

19 files changed, 42 insertions, 23 deletions

diff --git a/xts5/XI/Makefile.am b/xts5/XI/Makefile.am
index 2e81fdd3..e05d6bc9 100644
--- a/xts5/XI/Makefile.am
+++ b/xts5/XI/Makefile.am
@@ -4,7 +4,8 @@ AUTOMAKE_OPTIONS = subdir-objects
 AM_CFLAGS = $(XTS_LCFLAGS) $(XTS_CFLAGS)
 LDADD = $(TCM) $(XTS_LLIBS) $(XTS_LIBS)
 
-libexec_PROGRAMS = $(tprogs)
+testprogdir = $(libexecdir)/$(subdir)
+nobase_testprog_PROGRAMS = $(tprogs)
 BUILT_SOURCES = $(tprogs:$(EXEEXT)=.c)
 CLEANFILES = $(BUILT_SOURCES)
 
diff --git a/xts5/XIproto/Makefile.am b/xts5/XIproto/Makefile.am
index 8bc955cb..c4ce3fda 100644
--- a/xts5/XIproto/Makefile.am
+++ b/xts5/XIproto/Makefile.am
@@ -4,7 +4,8 @@ AUTOMAKE_OPTIONS = subdir-objects
 AM_CFLAGS = $(XP_LCFLAGS) $(XP_CFLAGS)
 LDADD = $(TCM) $(XP_LLIBS) $(XP_LIBS)
 
-libexec_PROGRAMS = $(tprogs)
+testprogdir = $(libexecdir)/$(subdir)
+nobase_testprog_PROGRAMS = $(tprogs)
 BUILT_SOURCES = $(tprogs:$(EXEEXT)=.c)
 CLEANFILES = $(BUILT_SOURCES)
 
diff --git a/xts5/Xlib10/Makefile.am b/xts5/Xlib10/Makefile.am
index 5fffb90d..7ea699f3 100644
--- a/xts5/Xlib10/Makefile.am
+++ b/xts5/Xlib10/Makefile.am
@@ -4,7 +4,8 @@ AUTOMAKE_OPTIONS = subdir-objects
 AM_CFLAGS = $(XTS_LCFLAGS) $(XTS_CFLAGS)
 LDADD = $(TCM) $(XTS_LLIBS) $(XTS_LIBS)
 
-libexec_PROGRAMS = $(tprogs)
+testprogdir = $(libexecdir)/$(subdir)
+nobase_testprog_PROGRAMS = $(tprogs)
 BUILT_SOURCES = $(tprogs:$(EXEEXT)=.c)
 CLEANFILES = $(BUILT_SOURCES)
 
diff --git a/xts5/Xlib11/Makefile.am b/xts5/Xlib11/Makefile.am
index 6e38eaf6..1348cc2e 100644
--- a/xts5/Xlib11/Makefile.am
+++ b/xts5/Xlib11/Makefile.am
@@ -4,7 +4,8 @@ AUTOMAKE_OPTIONS = subdir-objects
 AM_CFLAGS = $(XTS_LCFLAGS) $(XTS_CFLAGS)
 LDADD = $(TCM) $(XTS_LLIBS) $(XTS_LIBS)
 
-libexec_PROGRAMS = $(tprogs)
+testprogdir = $(libexecdir)/$(subdir)
+nobase_testprog_PROGRAMS = $(tprogs)
 BUILT_SOURCES = $(tprogs:$(EXEEXT)=.c)
 CLEANFILES = $(BUILT_SOURCES)
 
diff --git a/xts5/Xlib12/Makefile.am b/xts5/Xlib12/Makefile.am
index 2f3b1968..c94dc220 100644
--- a/xts5/Xlib12/Makefile.am
+++ b/xts5/Xlib12/Makefile.am
@@ -4,7 +4,8 @@ AUTOMAKE_OPTIONS = subdir-objects
 AM_CFLAGS = $(XTS_LCFLAGS) $(XTS_CFLAGS)
 LDADD = $(TCM) $(XTS_LLIBS) $(XTS_LIBS)
 
-libexec_PROGRAMS = $(tprogs)
+testprogdir = $(libexecdir)/$(subdir)
+nobase_testprog_PROGRAMS = $(tprogs)
 BUILT_SOURCES = $(tprogs:$(EXEEXT)=.c)
 CLEANFILES = $(BUILT_SOURCES)
 
@@ -38,5 +39,5 @@ tprogs = \
 	XWindowEvent
 
 # Auxiliary programs run from tests
-libexec_PROGRAMS += XDisplayName/Test1
+nobase_testprog_PROGRAMS += XDisplayName/Test1
 XDisplayName_Test1_LDADD = $(TCMCHILD) $(XTS_LLIBS) $(XTS_LIBS)
diff --git a/xts5/Xlib13/Makefile.am b/xts5/Xlib13/Makefile.am
index 9c88875a..a78c5e86 100644
--- a/xts5/Xlib13/Makefile.am
+++ b/xts5/Xlib13/Makefile.am
@@ -4,7 +4,8 @@ AUTOMAKE_OPTIONS = subdir-objects
 AM_CFLAGS = $(XTS_LCFLAGS) $(XTS_CFLAGS)
 LDADD = $(TCM) $(XTS_LLIBS) $(XTS_LIBS)
 
-libexec_PROGRAMS = $(tprogs)
+testprogdir = $(libexecdir)/$(subdir)
+nobase_testprog_PROGRAMS = $(tprogs)
 BUILT_SOURCES = $(tprogs:$(EXEEXT)=.c)
 CLEANFILES = $(BUILT_SOURCES)
 
diff --git a/xts5/Xlib14/Makefile.am b/xts5/Xlib14/Makefile.am
index 929c8c59..d0ccaf50 100644
--- a/xts5/Xlib14/Makefile.am
+++ b/xts5/Xlib14/Makefile.am
@@ -5,7 +5,8 @@ AM_CFLAGS = $(XTS_LCFLAGS) $(XTS_CFLAGS)
 LDADD = $(TCM) $(XTS_LLIBS) $(XTS_LIBS) \
 	$(top_builddir)/xts5/src/libXR5/libXR5.a
 
-libexec_PROGRAMS = $(tprogs)
+testprogdir = $(libexecdir)/$(subdir)
+nobase_testprog_PROGRAMS = $(tprogs)
 BUILT_SOURCES = $(tprogs:$(EXEEXT)=.c)
 CLEANFILES = $(BUILT_SOURCES)
 
diff --git a/xts5/Xlib15/Makefile.am b/xts5/Xlib15/Makefile.am
index bfdc4da9..e8105a80 100644
--- a/xts5/Xlib15/Makefile.am
+++ b/xts5/Xlib15/Makefile.am
@@ -4,7 +4,8 @@ AUTOMAKE_OPTIONS = subdir-objects
 AM_CFLAGS = $(XTS_LCFLAGS) $(XTS_CFLAGS)
 LDADD = $(TCM) $(XTS_LLIBS) $(XTS_LIBS)
 
-libexec_PROGRAMS = $(tprogs)
+testprogdir = $(libexecdir)/$(subdir)
+nobase_testprog_PROGRAMS = $(tprogs)
 BUILT_SOURCES = $(tprogs:$(EXEEXT)=.c)
 CLEANFILES = $(BUILT_SOURCES)
 
@@ -58,7 +59,7 @@ tprogs = \
 	XWithdrawWindow
 
 # Auxiliary programs run from tests
-libexec_PROGRAMS += \
+nobase_testprog_PROGRAMS += \
 	XSetWMProperties/Test1 \
 	XSetWMProperties/Test2
 XSetWMProperties_Test1_LDADD = $(TCMCHILD) $(XTS_LLIBS) $(XTS_LIBS)
diff --git a/xts5/Xlib16/Makefile.am b/xts5/Xlib16/Makefile.am
index c137bfb2..331ca5ca 100644
--- a/xts5/Xlib16/Makefile.am
+++ b/xts5/Xlib16/Makefile.am
@@ -4,7 +4,8 @@ AUTOMAKE_OPTIONS = subdir-objects
 AM_CFLAGS = $(XTS_LCFLAGS) $(XTS_CFLAGS)
 LDADD = $(TCM) $(XTS_LLIBS) $(XTS_LIBS)
 
-libexec_PROGRAMS = $(tprogs)
+testprogdir = $(libexecdir)/$(subdir)
+nobase_testprog_PROGRAMS = $(tprogs)
 BUILT_SOURCES = $(tprogs:$(EXEEXT)=.c)
 CLEANFILES = $(BUILT_SOURCES)
 
diff --git a/xts5/Xlib17/Makefile.am b/xts5/Xlib17/Makefile.am
index 0a167eba..36b64c71 100644
--- a/xts5/Xlib17/Makefile.am
+++ b/xts5/Xlib17/Makefile.am
@@ -4,7 +4,8 @@ AUTOMAKE_OPTIONS = subdir-objects
 AM_CFLAGS = $(XTS_LCFLAGS) $(XTS_CFLAGS)
 LDADD = $(TCM) $(XTS_LLIBS) $(XTS_LIBS)
 
-libexec_PROGRAMS = $(tprogs)
+testprogdir = $(libexecdir)/$(subdir)
+nobase_testprog_PROGRAMS = $(tprogs)
 BUILT_SOURCES = $(tprogs:$(EXEEXT)=.c)
 CLEANFILES = $(BUILT_SOURCES)
 
@@ -66,7 +67,7 @@ tprogs = \
 	XXorRegion
 
 # Auxiliary programs run from tests
-libexec_PROGRAMS += \
+nobase_testprog_PROGRAMS += \
 	XGetDefault/Test3 \
 	XGetDefault/Test4 \
 	XGetDefault/Test5
diff --git a/xts5/Xlib3/Makefile.am b/xts5/Xlib3/Makefile.am
index 489fed53..e1342b1e 100644
--- a/xts5/Xlib3/Makefile.am
+++ b/xts5/Xlib3/Makefile.am
@@ -4,7 +4,8 @@ AUTOMAKE_OPTIONS = subdir-objects
 AM_CFLAGS = $(XTS_LCFLAGS) $(XTS_CFLAGS)
 LDADD = $(TCM) $(XTS_LLIBS) $(XTS_LIBS)
 
-libexec_PROGRAMS = $(tprogs)
+testprogdir = $(libexecdir)/$(subdir)
+nobase_testprog_PROGRAMS = $(tprogs)
 BUILT_SOURCES = $(tprogs:$(EXEEXT)=.c)
 CLEANFILES = $(BUILT_SOURCES)
 
@@ -70,7 +71,7 @@ tprogs = XAllPlanes \
 	XWhitePixelOfScreen XWhitePixelOfScreen_m
 
 # Auxiliary programs run from tests
-libexec_PROGRAMS += \
+nobase_testprog_PROGRAMS += \
 	XDisplayString/Test1 \
 	XOpenDisplay/Test1
 XDisplayString_Test1_LDADD = $(TCMCHILD) $(XTS_LLIBS) $(XTS_LIBS)
diff --git a/xts5/Xlib4/Makefile.am b/xts5/Xlib4/Makefile.am
index 7f9b0485..13dc5474 100644
--- a/xts5/Xlib4/Makefile.am
+++ b/xts5/Xlib4/Makefile.am
@@ -4,7 +4,8 @@ AUTOMAKE_OPTIONS = subdir-objects
 AM_CFLAGS = $(XTS_LCFLAGS) $(XTS_CFLAGS)
 LDADD = $(TCM) $(XTS_LLIBS) $(XTS_LIBS)
 
-libexec_PROGRAMS = $(tprogs)
+testprogdir = $(libexecdir)/$(subdir)
+nobase_testprog_PROGRAMS = $(tprogs)
 BUILT_SOURCES = $(tprogs:$(EXEEXT)=.c)
 CLEANFILES = $(BUILT_SOURCES)
 
diff --git a/xts5/Xlib5/Makefile.am b/xts5/Xlib5/Makefile.am
index 6a5c93fd..707b58d4 100644
--- a/xts5/Xlib5/Makefile.am
+++ b/xts5/Xlib5/Makefile.am
@@ -4,7 +4,8 @@ AUTOMAKE_OPTIONS = subdir-objects
 AM_CFLAGS = $(XTS_LCFLAGS) $(XTS_CFLAGS)
 LDADD = $(TCM) $(XTS_LLIBS) $(XTS_LIBS)
 
-libexec_PROGRAMS = $(tprogs)
+testprogdir = $(libexecdir)/$(subdir)
+nobase_testprog_PROGRAMS = $(tprogs)
 BUILT_SOURCES = $(tprogs:$(EXEEXT)=.c)
 CLEANFILES = $(BUILT_SOURCES)
 
diff --git a/xts5/Xlib6/Makefile.am b/xts5/Xlib6/Makefile.am
index ff749ce1..b561b419 100644
--- a/xts5/Xlib6/Makefile.am
+++ b/xts5/Xlib6/Makefile.am
@@ -4,7 +4,8 @@ AUTOMAKE_OPTIONS = subdir-objects
 AM_CFLAGS = $(XTS_LCFLAGS) $(XTS_CFLAGS)
 LDADD = $(TCM) $(XTS_LLIBS) $(XTS_LIBS)
 
-libexec_PROGRAMS = $(tprogs)
+testprogdir = $(libexecdir)/$(subdir)
+nobase_testprog_PROGRAMS = $(tprogs)
 BUILT_SOURCES = $(tprogs:$(EXEEXT)=.c)
 CLEANFILES = $(BUILT_SOURCES)
 
diff --git a/xts5/Xlib7/Makefile.am b/xts5/Xlib7/Makefile.am
index 995bcf5d..583094a6 100644
--- a/xts5/Xlib7/Makefile.am
+++ b/xts5/Xlib7/Makefile.am
@@ -5,7 +5,8 @@ AM_CFLAGS = $(XTS_LCFLAGS) $(XTS_CFLAGS)
 LDADD = $(TCM) $(XTS_LLIBS) $(XTS_LIBS) \
 	$(top_builddir)/xts5/src/libXR5/libXR5.a
 
-libexec_PROGRAMS = $(tprogs)
+testprogdir = $(libexecdir)/$(subdir)
+nobase_testprog_PROGRAMS = $(tprogs)
 BUILT_SOURCES = $(tprogs:$(EXEEXT)=.c)
 CLEANFILES = $(BUILT_SOURCES)
 
diff --git a/xts5/Xlib8/Makefile.am b/xts5/Xlib8/Makefile.am
index d1a18756..36fb4cde 100644
--- a/xts5/Xlib8/Makefile.am
+++ b/xts5/Xlib8/Makefile.am
@@ -4,7 +4,8 @@ AUTOMAKE_OPTIONS = subdir-objects
 AM_CFLAGS = $(XTS_LCFLAGS) $(XTS_CFLAGS)
 LDADD = $(TCM) $(XTS_LLIBS) $(XTS_LIBS)
 
-libexec_PROGRAMS = $(tprogs)
+testprogdir = $(libexecdir)/$(subdir)
+nobase_testprog_PROGRAMS = $(tprogs)
 BUILT_SOURCES = $(tprogs:$(EXEEXT)=.c)
 CLEANFILES = $(BUILT_SOURCES)
 
diff --git a/xts5/Xlib9/Makefile.am b/xts5/Xlib9/Makefile.am
index 527813e3..5be88768 100644
--- a/xts5/Xlib9/Makefile.am
+++ b/xts5/Xlib9/Makefile.am
@@ -4,7 +4,8 @@ AUTOMAKE_OPTIONS = subdir-objects
 AM_CFLAGS = $(XTS_LCFLAGS) $(XTS_CFLAGS)
 LDADD = $(TCM) $(XTS_LLIBS) $(XTS_LIBS)
 
-libexec_PROGRAMS = $(tprogs)
+testprogdir = $(libexecdir)/$(subdir)
+nobase_testprog_PROGRAMS = $(tprogs)
 BUILT_SOURCES = $(tprogs:$(EXEEXT)=.c)
 CLEANFILES = $(BUILT_SOURCES)
 
diff --git a/xts5/Xopen/Makefile.am b/xts5/Xopen/Makefile.am
index ce1dcf16..5cd03c1b 100644
--- a/xts5/Xopen/Makefile.am
+++ b/xts5/Xopen/Makefile.am
@@ -4,7 +4,8 @@ AUTOMAKE_OPTIONS = subdir-objects
 AM_CFLAGS = $(XTS_LCFLAGS) $(XTS_CFLAGS)
 LDADD = $(TCM) $(XTS_LLIBS) $(XTS_LIBS)
 
-libexec_PROGRAMS = $(tprogs)
+testprogdir = $(libexecdir)/$(subdir)
+nobase_testprog_PROGRAMS = $(tprogs)
 BUILT_SOURCES = $(tprogs:$(EXEEXT)=.c)
 CLEANFILES = $(BUILT_SOURCES)
 
diff --git a/xts5/Xproto/Makefile.am b/xts5/Xproto/Makefile.am
index da440082..acfb465b 100644
--- a/xts5/Xproto/Makefile.am
+++ b/xts5/Xproto/Makefile.am
@@ -4,7 +4,8 @@ AUTOMAKE_OPTIONS = subdir-objects
 AM_CFLAGS = $(XP_LCFLAGS) $(XP_CFLAGS)
 LDADD = $(TCM) $(XP_LLIBS) $(XP_LIBS)
 
-libexec_PROGRAMS = $(tprogs)
+testprogdir = $(libexecdir)/$(subdir)
+nobase_testprog_PROGRAMS = $(tprogs)
 BUILT_SOURCES = $(tprogs:$(EXEEXT)=.c)
 CLEANFILES = $(BUILT_SOURCES)