Index: /trunk/psLib/etc/Makefile.am
===================================================================
--- /trunk/psLib/etc/Makefile.am	(revision 9976)
+++ /trunk/psLib/etc/Makefile.am	(revision 9977)
@@ -5,5 +5,5 @@
 # until --prefix is known
 pslib.config: $(srcdir)/pslib.config.template
-	$(PERL) -pe 's|DATADIR|$(pkgdatadir)|' $? > $@
+	$(PERL) -pe 's|PREFIX|$(prefix)|' $? > $@
 
 pslibconfdir = $(sysconfdir)/@PACKAGE_NAME@
Index: /trunk/psLib/etc/pslib.config.template
===================================================================
--- /trunk/psLib/etc/pslib.config.template	(revision 9976)
+++ /trunk/psLib/etc/pslib.config.template	(revision 9977)
@@ -3,5 +3,5 @@
 # psTime settings
 #
-psLib.time.tables.dir STR DATADIR
+psLib.time.tables.dir STR PREFIX/share
 psLib.time.tables.n S32 4                                                               # Number of time tables
 psLib.time.tables.files STR daily.dat eopc01_1900_2004.dat finals_all.dat tai_utc.dat
@@ -31,9 +31,9 @@
 psLib.eoc.precession.iers.table.format STR %lf %lf %lf %lf %lf
 psLib.eoc.precession.finals.table.format STR %lf %lf %lf %lf %lf %lf %lf
-psLib.eoc.precession.table.file.x STR DATADIR/tab5.2a.dat
-psLib.eoc.precession.table.file.y STR DATADIR/tab5.2b.dat
-psLib.eoc.precession.table.file.s STR DATADIR/tab5.2c.dat
-psLib.eoc.precession.table.file.iers STR DATADIR/finals2000A.dat
-psLib.eoc.precession.table.file.final STR DATADIR/finals_all.dat
+psLib.eoc.precession.table.file.x STR PREFIX/share/tab5.2a.dat
+psLib.eoc.precession.table.file.y STR PREFIX/share/tab5.2b.dat
+psLib.eoc.precession.table.file.s STR PREFIX/share/tab5.2c.dat
+psLib.eoc.precession.table.file.iers STR PREFIX/share/finals2000A.dat
+psLib.eoc.precession.table.file.final STR PREFIX/share/finals_all.dat
 @psLib.eoc.precession.poly.x F64 -16616.99 2004191742.88 -427219.05 -198620.54 -46.05 5.98
 @psLib.eoc.precession.poly.y F64 -6950.78 -25381.99 -22407250.99 1842.28 1113.06 0.99
Index: /trunk/psLib/test/astro/data/psTime.config.template
===================================================================
--- /trunk/psLib/test/astro/data/psTime.config.template	(revision 9976)
+++ /trunk/psLib/test/astro/data/psTime.config.template	(revision 9977)
@@ -1,4 +1,4 @@
 # This configuration file specifies values required for time calculations by psLib.
-psLib.time.tables.dir STR PREFIX/share/pslib                                            # Directory for time tables
+psLib.time.tables.dir STR PREFIX/share                                                  # Directory for time tables
 psLib.time.tables.n S32 4                                                               # Number of time tables
 psLib.time.tables.files STR ser7.dat eopc01_1900_2004.dat finals_all.dat tai_utc.dat    # These are the table file names
Index: /trunk/psLib/test/astro/data/test.psTime.config2.template
===================================================================
--- /trunk/psLib/test/astro/data/test.psTime.config2.template	(revision 9976)
+++ /trunk/psLib/test/astro/data/test.psTime.config2.template	(revision 9977)
@@ -1,4 +1,4 @@
 # This configuration file specifies values required for time calculations by psLib.
-psLib.time.tables.dir STR PREFIX/share/pslib                                            # Directory for time tables
+psLib.time.tables.dir STR PREFIX/share                                                  # Directory for time tables
 psLib.time.tables.n S32 4                                                               # Number of time tables
 psLib.time.tables.files STR eopc01_1900_2004.dat finals_all.dat tai_utc.dat    # These are the table file names
Index: /trunk/psLib/test/astro/data/test.psTime.config3.template
===================================================================
--- /trunk/psLib/test/astro/data/test.psTime.config3.template	(revision 9976)
+++ /trunk/psLib/test/astro/data/test.psTime.config3.template	(revision 9977)
@@ -1,4 +1,4 @@
 # This configuration file specifies values required for time calculations by psLib.
-psLib.time.tables.dir STR PREFIX/share/pslib                                            # Directory for time tables
+psLib.time.tables.dir STR PREFIX/share                                                  # Directory for time tables
 psLib.time.tables.n S32 4                                                               # Number of time tables
 psLib.time.tables.files STR ser7.dat eopc01_1900_2004.dat finals_all.dat tai_utc.dat    # These are the table file names