Index: /trunk/psLib/etc/Makefile.am
===================================================================
--- /trunk/psLib/etc/Makefile.am	(revision 8959)
+++ /trunk/psLib/etc/Makefile.am	(revision 8960)
@@ -4,5 +4,5 @@
 # this is done instead of using autoconf to delay the expansion of datadir
 # until --prefix is known
-pslib.config: pslib.config.template
+pslib.config: $(srcdir)/pslib.config.template
 	$(PERL) -pe 's|DATADIR|$(pkgdatadir)|' $? > $@
 
Index: /trunk/psLib/test/astro/Makefile.am
===================================================================
--- /trunk/psLib/test/astro/Makefile.am	(revision 8959)
+++ /trunk/psLib/test/astro/Makefile.am	(revision 8960)
@@ -4,12 +4,4 @@
 	$(top_builddir)/test/tap/src/libtap.la \
 	$(PSLIB_LIBS)
-
-check_DATA = \
-	pslib.config \
-	test.psTime.config1 \
-	test.psTime.config2 \
-	test.psTime.config3 \
-	test.psTime.config4 \
-	test.ser7.dat
 
 TEST_PROGS =
@@ -22,22 +14,38 @@
 endif
 
-CLEANFILES = $(check_DATA) temp/* core core.* *~ *.bb *.bbg *.da gmon.out
+EXTRA_DIST = \
+	data/psTime.config.template \
+	data/test.psTime.config1.template \
+	data/test.psTime.config2.template \
+	data/test.psTime.config3.template \
+	data/test.psTime.config4.template \
+	data/test.ser7.dat 
 
-pslib.config: $(top_srcdir)/etc/pslib/pslib.config.template
+tmp_files = \
+	pslib.config \
+	test.psTime.config1 \
+	test.psTime.config2 \
+	test.psTime.config3 \
+	test.psTime.config4 \
+	test.ser7.dat
+
+CLEANFILES = $(tmp_files) core core.* *~ *.bb *.bbg *.da gmon.out
+
+pslib.config: $(top_srcdir)/etc/pslib.config.template
 	$(PERL) -pe 's|DATADIR|$(top_srcdir)/share|' $? > $@
 
-test.psTime.config1: data/test.psTime.config1.template
+test.psTime.config1: $(srcdir)/data/test.psTime.config1.template
 	cp $? $@
 
-test.psTime.config2: data/test.psTime.config2.template
+test.psTime.config2: $(srcdir)/data/test.psTime.config2.template
 	$(PERL) -pe 's|PREFIX|$(top_srcdir)|' $? > $@
 
-test.psTime.config3: data/test.psTime.config3.template
+test.psTime.config3: $(srcdir)/data/test.psTime.config3.template
 	$(PERL) -pe 's|PREFIX|$(top_srcdir)|' $? > $@
 
-test.psTime.config4: data/test.psTime.config4.template
+test.psTime.config4: $(srcdir)/data/test.psTime.config4.template
 	cp $? $@
 
-test.ser7.dat: data/test.ser7.dat
+test.ser7.dat: $(srcdir)/data/test.ser7.dat
 	cp $? $@
 
Index: /trunk/psLib/test/types/Makefile.am
===================================================================
--- /trunk/psLib/test/types/Makefile.am	(revision 8959)
+++ /trunk/psLib/test/types/Makefile.am	(revision 8960)
@@ -33,7 +33,8 @@
 endif
 
-check_DATA = \
+EXTRA_DIST = \
 	data/header_1.fits \
 	data/header_2.fits \
+	data/mdcfgwrt.verified \
 	data/test.config \
 	data/test1.config \
@@ -41,42 +42,53 @@
 	data/test3.config \
 	data/test4.config \
-	data/test5.config \
-	data/mdcfgwrt.verified
+	data/test5.config 
 
-CLEANFILES = multi.fits table.fits temp/* MDCopy.in MDCopy.out mdcfgwrt.out \
+tmp_files = \
+	header_1.fits \
+	header_2.fits \
+	mdcfgwrt.verified \
+	test.config \
+	test1.config \
+	test2.config \
+	test3.config \
+	test4.config \
+	test5.config 
+
+CLEANFILES = $(tmp_files) multi.fits table.fits temp/* MDCopy.in MDCopy.out mdcfgwrt.out \
 	core core.* *~ *.bb *.bbg *.da gmon.out
 
-tests: $(check_PROGRAMS) $(check_DATA)
+tests: $(check_PROGRAMS)
 	$(top_srcdir)/test/test.pl
 
+# XXX what is the point of verbatim copying these files?
 
 %.dat: verified/%.dat
 	cp $? $@
 
-test.config: data/test.config
+test.config: $(srcdir)/data/test.config
 	cp $? $@
 
-test1.config: data/test1.config
+test1.config: $(srcdir)/data/test1.config
 	cp $? $@
 
-test2.config: data/test2.config
+test2.config: $(srcdir)/data/test2.config
 	cp $? $@
 
-test3.config: data/test3.config
+test3.config: $(srcdir)/data/test3.config
 	cp $? $@
 
-test4.config: data/test4.config
+test4.config: $(srcdir)/data/test4.config
 	cp $? $@
 
-test5.config: data/test5.config
+test5.config: $(srcdir)/data/test5.config
 	cp $? $@
 
-header_1.fits: data/header_1.fits
+header_1.fits: $(srcdir)/data/header_1.fits
 	cp $? $@
 
-header_2.fits: data/header_2.fits
+header_2.fits: $(srcdir)/data/header_2.fits
 	cp $? $@
 
-mdcfgwrt.verified: data/mdcfgwrt.verified
+mdcfgwrt.verified: $(srcdir)/data/mdcfgwrt.verified
 	cp $? $@