Changeset 3185

Timestamp:

Feb 9, 2005, 4:59:35 PM (21 years ago)

Author:

desonia

Message:

* empty log message *

Location:

trunk/psLib

Files:

• Makefile.am (modified) (3 diffs)
• configure.in (modified) (3 diffs)
• etc/pslib/Makefile.am (modified) (1 diff)
• src/config.h.in (modified) (1 diff)

trunk/psLib/Makefile.am

@@ -1 @@
-SUBDIRS = etc src test swig
+SUBDIRS = etc/pslib src test swig
 
 bin_SCRIPTS = pslib-config
@@ -6 +6 @@
 pkgconfig_DATA= pslib.pc
 
-EXTRA_DIST = Doxyfile pslib-config.in pslib.pc.in config data
+EXTRA_DIST = Doxyfile pslib-config.in pslib.pc.in share
 
 docs:
@@ -12 +12 @@
 
 install-data-hook:
-  $(INSTALL) share/* $(datadir)
+        $(INSTALL) $(srcdir)/share/pslib/* $(datadir)/pslib

trunk/psLib/configure.in

@@ -16 +16 @@
   [AC_HELP_STRING([--enable-debug],[Enable debug information in compilation])],
   [AC_MSG_RESULT(debug information enabled)
-   AC_DEFINE(DEBUG)
+   AC_DEFINE(DEBUG,[], [debug information requested])
    CFLAGS="${CFLAGS=} -O0 -g2"],
   [AC_MSG_RESULT(debug information disabled)]
@@ -34 +34 @@
 test "$prefix" = NONE && prefix=`pwd`
 
-
 dnl Setup the info for psLib for pkg-config
-PSLIB_CFLAGS="-I${includedir=}"
+PSLIB_CFLAGS="-I${includedir}"
 PSLIB_LIBS="-L${libdir} -lpslib"
 
@@ -125 +124 @@
 
 dnl --------- set config/data file location --------------
-AC_DEFINE_UNQUOTED(CONFIG_FILE, "$sysconfdir/psTime.config", [Location of the psTime.config file])
-AC_DEFINE_UNQUOTED(XML_CONFIG_FILE, "$sysconfdir/psTime.xml", [Location of the psTime.xml file])
-AC_DEFINE_UNQUOTED(UTC_DAT_FILE, "$datadir/tai_utc.dat", [Location of the tai_utc.dat file])
+AC_DEFINE_UNQUOTED(CONFIG_FILE, "$sysconfdir/pslib/psTime.config", [Location of the psTime.config file])
+AC_DEFINE_UNQUOTED(XML_CONFIG_FILE, "$sysconfdir/pslib/psTime.xml", [Location of the psTime.xml file])
+AC_DEFINE_UNQUOTED(UTC_DAT_FILE, "$datadir/pslib/tai_utc.dat", [Location of the tai_utc.dat file])
 
 dnl for MacOSX, where sqrtf is in mx

trunk/psLib/etc/pslib/Makefile.am

@@ -10 +10 @@
         sed 's|PREFIX|$(prefix)|' $? > $@
 
+install-data-hook:
+        $(INSTALL) $(srcdir)/psTime.xml $(srcdir)/psTime.config $(datadir)/pslib

trunk/psLib/src/config.h.in

@@ -3 +3 @@
 /* Location of the psTime.config file */
 #undef CONFIG_FILE
+
+/* debug information requested */
+#undef DEBUG
 
 /* Define to dummy `main' function (if any) required to link to the Fortran