Index: trunk/psLib/etc/.cvsignore
===================================================================
--- trunk/psLib/etc/.cvsignore	(revision 8896)
+++ trunk/psLib/etc/.cvsignore	(revision 8898)
@@ -4,2 +4,3 @@
 *.bbg
 *.da
+pslib.config
Index: trunk/psLib/etc/Makefile.am
===================================================================
--- trunk/psLib/etc/Makefile.am	(revision 8896)
+++ trunk/psLib/etc/Makefile.am	(revision 8898)
@@ -1,2 +1,14 @@
-SUBDIRS = pslib 
+BUILT_SOURCES = pslib.config
+EXTRA_DIST = pslib.config.template
 
+# this is done instead of using autoconf to delay the expansion of datadir
+# until --prefix is known
+pslib.config: pslib.config.template
+	$(PERL) -pe 's|DATADIR|$(datadir)|' $? > $@
+
+pslibconfdir = $(sysconfdir)/@PACKAGE_NAME@
+pslibconf_DATA = pslib.config
+
+install-data-hook:
+	chmod 0755 $(pslibconfdir)
+
Index: trunk/psLib/etc/pslib.config.template
===================================================================
--- trunk/psLib/etc/pslib.config.template	(revision 8898)
+++ trunk/psLib/etc/pslib.config.template	(revision 8898)
@@ -0,0 +1,43 @@
+# This configuration file specifies values required by psLib.
+#
+# psTime settings
+#
+psLib.time.tables.dir STR DATADIR/pslib                                                 # Directory for time tables
+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
+psLib.time.tables.format STR %lf %lf %lf %lf %lf %lf %lf, %lf %lf %lf %lf, %lf %lf %lf %lf %lf %lf %lf, %lf %lf %lf %lf
+@psLib.time.tables.index S32 0, 0, 0, 0
+@psLib.time.tables.from F64 53403.0, 15020.0, 41684.0 2437300.5                         # Valid from these dates
+@psLib.time.tables.to F64 53583.0, 53258.0, 53627.0 2451179.5                           # Valid to these dates
+psLib.time.before.xp F64 0.0                                                            # Value of XP for before the earliest MJD
+psLib.time.before.yp F64 0.0                                                            # Value of YP for before the earliest MJD
+psLib.time.before.dut F64 0.0                                                           # Value of UT1-UTC for before the earliest MJD
+# Now follows formulae for predicting ahead of the most recent available table entry.
+# xp = [0] + [1]*cos A + [2]*sin A + [3]*cos C + [4]*sin C
+# yp = [0] + [1]*cos A + [2]*sin A + [3]*cos C + [4]*sin C
+# A = 2*pi*(MJD - pslib.time.predict.mjd)/365.25
+# C = 2*pi*(MJD - pslib.time.predict.mjd)/435.0
+# dut = ut1-utc = [0] + [1]*(MJD - [2]) - (UT2-UT1)
+# ut2-ut1 = 0.022 sin(2*pi*T) - 0.012 cos(2*pi*T) - 0.006 sin(4*pi*T) + 0.007 cos(4*pi*T)
+# T = 2000.0 + (MJD - 51544.03)/365.2422
+@psLib.time.predict.xp F64 0.0569, 0.0555, -0.0200, 0.0513, 0.1483
+@psLib.time.predict.yp F64 0.3498, -0.0176, -0.0498, 0.1483, -0.0513
+psLib.time.predict.mjd F64 53257.0
+@psLib.time.predict.dut F64 -0.4944, -0.00023, 53262.0
+#
+# psEOC settings
+#
+psLib.eoc.precession.table.format STR  %lf %lf %lf %lf %lf %lf %lf %lf %lf %lf %lf %lf %lf %lf %lf %lf %lf
+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/pslib/tab5.2a.dat
+psLib.eoc.precession.table.file.y STR DATADIR/pslib/tab5.2b.dat
+psLib.eoc.precession.table.file.s STR DATADIR/pslib/tab5.2c.dat
+psLib.eoc.precession.table.file.iers STR DATADIR/pslib/finals2000A.dat
+psLib.eoc.precession.table.file.final STR DATADIR/pslib/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
+@psLib.eoc.precession.poly.s F64 94.0 3808.35 -119.94 -72574.09 27.70 15.61
+
+
+
Index: trunk/psLib/etc/pslib/.cvsignore
===================================================================
--- trunk/psLib/etc/pslib/.cvsignore	(revision 8896)
+++ 	(revision )
@@ -1,6 +1,0 @@
-pslib.config
-Makefile
-Makefile.in
-*.bb
-*.bbg
-*.da
Index: trunk/psLib/etc/pslib/Makefile.am
===================================================================
--- trunk/psLib/etc/pslib/Makefile.am	(revision 8896)
+++ 	(revision )
@@ -1,14 +1,0 @@
- #Makefile for astronomy functions of psLib
-#
-
-BUILT_SOURCES = pslib.config
-CLEANFILES = pslib.config
-
-EXTRA_DIST = psTime.xml pslib.config.template
-
-pslib.config: pslib.config.template
-	$(PERL) -pe 's|DATADIR|$(datadir)|' $? > $@
-
-$(sysconfdir)/pslib:
-	mkdir -p -m 755 $(sysconfdir)/pslib
-
Index: trunk/psLib/etc/pslib/pslib.config.template
===================================================================
--- trunk/psLib/etc/pslib/pslib.config.template	(revision 8896)
+++ 	(revision )
@@ -1,43 +1,0 @@
-# This configuration file specifies values required by psLib.
-#
-# psTime settings
-#
-psLib.time.tables.dir STR DATADIR/pslib                                                 # Directory for time tables
-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
-psLib.time.tables.format STR %lf %lf %lf %lf %lf %lf %lf, %lf %lf %lf %lf, %lf %lf %lf %lf %lf %lf %lf, %lf %lf %lf %lf
-@psLib.time.tables.index S32 0, 0, 0, 0
-@psLib.time.tables.from F64 53403.0, 15020.0, 41684.0 2437300.5                         # Valid from these dates
-@psLib.time.tables.to F64 53583.0, 53258.0, 53627.0 2451179.5                           # Valid to these dates
-psLib.time.before.xp F64 0.0                                                            # Value of XP for before the earliest MJD
-psLib.time.before.yp F64 0.0                                                            # Value of YP for before the earliest MJD
-psLib.time.before.dut F64 0.0                                                           # Value of UT1-UTC for before the earliest MJD
-# Now follows formulae for predicting ahead of the most recent available table entry.
-# xp = [0] + [1]*cos A + [2]*sin A + [3]*cos C + [4]*sin C
-# yp = [0] + [1]*cos A + [2]*sin A + [3]*cos C + [4]*sin C
-# A = 2*pi*(MJD - pslib.time.predict.mjd)/365.25
-# C = 2*pi*(MJD - pslib.time.predict.mjd)/435.0
-# dut = ut1-utc = [0] + [1]*(MJD - [2]) - (UT2-UT1)
-# ut2-ut1 = 0.022 sin(2*pi*T) - 0.012 cos(2*pi*T) - 0.006 sin(4*pi*T) + 0.007 cos(4*pi*T)
-# T = 2000.0 + (MJD - 51544.03)/365.2422
-@psLib.time.predict.xp F64 0.0569, 0.0555, -0.0200, 0.0513, 0.1483
-@psLib.time.predict.yp F64 0.3498, -0.0176, -0.0498, 0.1483, -0.0513
-psLib.time.predict.mjd F64 53257.0
-@psLib.time.predict.dut F64 -0.4944, -0.00023, 53262.0
-#
-# psEOC settings
-#
-psLib.eoc.precession.table.format STR  %lf %lf %lf %lf %lf %lf %lf %lf %lf %lf %lf %lf %lf %lf %lf %lf %lf
-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/pslib/tab5.2a.dat
-psLib.eoc.precession.table.file.y STR DATADIR/pslib/tab5.2b.dat
-psLib.eoc.precession.table.file.s STR DATADIR/pslib/tab5.2c.dat
-psLib.eoc.precession.table.file.iers STR DATADIR/pslib/finals2000A.dat
-psLib.eoc.precession.table.file.final STR DATADIR/pslib/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
-@psLib.eoc.precession.poly.s F64 94.0 3808.35 -119.94 -72574.09 27.70 15.61
-
-
-