Changeset 6793

Timestamp:

Apr 5, 2006, 11:16:46 AM (20 years ago)

Author:

desonia

Message:

changed version and tweaks for distcheck.

Location:

trunk/psLib

Files:

• Makefile.am (modified) (1 diff)
• configure.ac (modified) (2 diffs)
• etc/pslib/Makefile.am (modified) (1 diff)
• src/Makefile.am (modified) (1 diff)
• test/types/Makefile.am (modified) (3 diffs)
• test/types/data/mdcfgwrt.verified (added)
• test/types/mdcfgwrt.verified (deleted)

trunk/psLib/Makefile.am

@@ -35 +35 @@
         mkdir -p -m 755 $(datadir)/pslib
 
-install-data-hook: $(datadir)/pslib
-        if [ `pwd`/share != $(datadir) ] ; then $(INSTALL) $(srcdir)/share/pslib/*.dat $(datadir)/pslib ; fi
+$(sysconfdir)/pslib:
+        mkdir -p -m 755 $(sysconfdir)/pslib
+
+install-data-hook: $(datadir)/pslib $(sysconfdir)/pslib
+        if [ `pwd`/share != $(datadir) ] ; then $(INSTALL_DATA) $(srcdir)/share/pslib/*.dat $(datadir)/pslib ; fi
+        if [ `pwd`/etc != $(sysconfdir) ] ; then  $(INSTALL_DATA) $(srcdir)/etc/pslib/psTime.xml etc/pslib/pslib.config $(sysconfdir)/pslib ; fi
 
 uninstall-hook:
-        if [ `pwd`/share/pslib != $(datadir) ] ; then rm -rf $(datadir) ; fi
+        if [ `pwd`/share != $(datadir) ] ; then rm -rf $(datadir)/pslib ; fi
+        if [ `pwd`/etc != $(sysconfdir) ] ; then  rm -rf $(sysconfdir)/pslib ; fi
         rm -rf $(prefix)/docs/pslib/*
 

trunk/psLib/configure.ac

@@ -1 +1 @@
 AC_PREREQ(2.59)
 
-AC_INIT([pslib],[0.9.99],[http://pan-starrs.ifa.hawaii.edu/bugzilla])
+AC_INIT([pslib],[0.11.0],[http://pan-starrs.ifa.hawaii.edu/bugzilla])
 AC_CONFIG_SRCDIR([pslib.pc.in])
 AC_CANONICAL_TARGET
@@ -9 +9 @@
 AM_MAINTAINER_MODE
 
-PSLIB_LT_VERSION="0:10:0"
+PSLIB_LT_VERSION="0:11:0"
 AC_SUBST(PSLIB_LT_VERSION,$PSLIB_LT_VERSION)
 

trunk/psLib/etc/pslib/Makefile.am

@@ -13 +13 @@
         mkdir -p -m 755 $(sysconfdir)/pslib
 
-install-exec-hook: pslib.config $(sysconfdir)/pslib
-        if [ `pwd` != $(sysconfdir)/pslib ] ; then  $(INSTALL) $(srcdir)/psTime.xml pslib.config $(sysconfdir)/pslib ; fi
-
-uninstall-local:
-        if [ `pwd` != $(sysconfdir) ] ; then  rm -rf $(sysconfdir) ; fi
-

trunk/psLib/src/Makefile.am

@@ -24 +24 @@
         psErrorText.h
 
-install-exec-hook: libpslib.la
-        $(PERL) -pe "s|(^dependency_libs=.*)|dependency_libs=\'$(PSLIB_LIBS)\'|" $(libdir)/libpslib.la > libpslib.la.temp
-        $(INSTALL) libpslib.la.temp $(libdir)/libpslib.la
+install-exec-local: libpslib.la
+        $(PERL) -pe "s|(^dependency_libs=.*)|dependency_libs=\'$(PSLIB_LIBS)\'|" libpslib.la > libpslib.la.temp
+        cp libpslib.la.temp libpslib.la

trunk/psLib/test/types/Makefile.am

@@ -64 +64 @@
         tableF32.dat \
         tableS32.dat \
-        tableU8.dat
+        tableU8.dat \
+    mdcfgwrt.verified
 
 check_PROGRAMS = $(TESTS)
@@ -79 +80 @@
         data/test3.config \
         data/test4.config \
-        data/test5.config
+        data/test5.config \
+    data/mdcfgwrt.verified
 
 
-CLEANFILES = $(TESTS) $(check_DATA) multi.fits table.fits temp/*
+CLEANFILES = $(TESTS) $(check_DATA) multi.fits table.fits temp/* MDCopy.in MDCopy.out mdcfgwrt.out
 
 tests: $(check_DATA) $(TESTS)
@@ -113 +115 @@
         cp $? $@
 
+mdcfgwrt.verified: data/mdcfgwrt.verified
+        cp $? $@
+
 test: check