Changeset 8910

Timestamp:

Sep 22, 2006, 5:25:42 PM (20 years ago)

Author:

jhoblitt

Message:

use pkgdatadir where possible

Location:

trunk/psLib

Files:

• configure.ac (modified) (1 diff)
• etc/Makefile.am (modified) (1 diff)
• etc/pslib.config.template (modified) (2 diffs)
• share/Makefile.am (modified) (2 diffs)

trunk/psLib/configure.ac

@@ -26 +26 @@
     AC_SUBST(PERL,$PERL)
 
-SUBDIR="etc src test utils" dnl don't include 'swig', as it is optional
+SUBDIR="etc src share test utils" dnl don't include 'swig', as it is optional
 
 SRCPATH='${top_srcdir}/src'

trunk/psLib/etc/Makefile.am

@@ -5 +5 @@
 # until --prefix is known
 pslib.config: pslib.config.template
-        $(PERL) -pe 's|DATADIR|$(datadir)|' $? > $@
+        $(PERL) -pe 's|DATADIR|$(pkgdatadir)|' $? > $@
 
 pslibconfdir = $(sysconfdir)/@PACKAGE_NAME@

trunk/psLib/etc/pslib.config.template

@@ -3 +3 @@
 # psTime settings
 #
-psLib.time.tables.dir STR DATADIR/pslib                                                 # Directory for time tables
+psLib.time.tables.dir STR DATADIR
 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 +31 @@
 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.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.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

trunk/psLib/share/Makefile.am

@@ -1 @@
-pslibdatadir = $(datadir)/@PACKAGE_NAME@
-pslibdata_DATA = \
+dist_pkgdata_DATA = \
         tab5.2a.dat \
         tab5.2b.dat \
@@ -7 +6 @@
         finals_all.dat
 
-install-data-hook:
-        chmod 0755 $(pslibdatadir)
-