Index: trunk/psLib/test/astronomy/Makefile.am
===================================================================
--- trunk/psLib/test/astronomy/Makefile.am	(revision 3237)
+++ trunk/psLib/test/astronomy/Makefile.am	(revision 3246)
@@ -13,4 +13,5 @@
 AM_LDFLAGS = -L$(top_builddir)/src -lpslib $(PSLIB_LIBS)
 AM_CFLAGS = -DXML_CONFIG_FILE="\"$(top_srcdir)/etc/pslib/psTime.xml\""
+  
 
 check_PROGRAMS = tst_psTime_01 \
@@ -30,5 +31,15 @@
          tst_psAstrometry01
 
-TESTS_ENVIRONMENT = perl $(top_srcdir)/test/runTest --verified=$(srcdir)/verified
+check_DATA = test.config \
+        psTime.config \
+        test.psTime.config1 \
+        test.psTime.config2 \
+        test.psTime.config3 \
+        test.psTime.config4 \
+        header_1.fits \
+        header_2.fits \
+        test.ser7.dat
+
+TESTS_ENVIRONMENT = export PS_CONFIG_FILE="psTime.config" && perl $(top_srcdir)/test/runTest --verified=$(srcdir)/verified
  
 TESTS = tst_psTime_01 \
@@ -48,6 +59,6 @@
          tst_psAstrometry01
 
-tests: $(TESTS) test.psTime.config1 test.psTime.config2 test.psTime.config3 test.psTime.config4
- 
+tests: $(check_DATA) $(TESTS)
+        
 tst_psTime_01_SOURCES = tst_psTime_01.c
 tst_psTime_02_SOURCES = tst_psTime_02.c
@@ -66,27 +77,35 @@
 tst_psAstrometry01_SOURCES = tst_psAstrometry01.c
 
-BUILT_SOURCES = test.psTime.config1 test.psTime.config2 test.psTime.config3 test.psTime.config4
-CLEANFILES = test.psTime.config1 test.psTime.config2 test.psTime.config3 test.psTime.config4
+EXTRA_DIST = data/test.psTime.config1.template \
+	data/test.psTime.config2.template \
+	data/test.psTime.config3.template \
+	data/test.psTime.config4.template \
+	data/header_1.fits \
+	data/header_2.fits \
+	data/test.config \
+	data/test.ser7.dat \
+	verified 
 
-EXTRA_DIST = test.psTime.config1.template \
-	test.psTime.config2.template \
-	test.psTime.config3.template \
-	test.psTime.config4.template \
-	verified \
-	test.ser7.dat \
-	header_1.fits \
-	header_2.fits \
-	test.config
+psTime.config: $(top_srcdir)/etc/pslib/psTime.config.template
+	sed 's|PREFIX|$(top_srcdir)|' $? > $@
 
-test.psTime.config1: test.psTime.config1.template
-	sed 's|PREFIX|$(prefix)|' $? > $@
+test.psTime.config1: data/test.psTime.config1.template
+	cp $? $@
 
-test.psTime.config2: test.psTime.config2.template
-	sed 's|PREFIX|$(prefix)|' $? > $@
+test.psTime.config2: data/test.psTime.config2.template
+	sed 's|PREFIX|$(top_srcdir)|' $? > $@
 
-test.psTime.config3: test.psTime.config3.template
-	sed 's|PREFIX|$(prefix)|' $? > $@
+test.psTime.config3: data/test.psTime.config3.template
+	sed 's|PREFIX|$(top_srcdir)|' $? > $@
 
-test.psTime.config4: test.psTime.config4.template
-	sed 's|PREFIX|$(prefix)|' $? > $@
+test.psTime.config4: data/test.psTime.config4.template
+	sed 's|PREFIX|$(srcdir)|' $? > $@
 
+test.config: data/test.config
+	cp $? $@
+
+header_1.fits: data/header_1.fits
+	cp $? $@
+
+header_2.fits: data/header_2.fits
+	cp $? $@