Changeset 8988

Timestamp:

Sep 26, 2006, 12:58:09 PM (20 years ago)

Author:

jhoblitt

Message:

cleanup pkgconfig & -config helper script -- sync with psmodules

Location:

trunk/psLib

Files:

• pslib-config.in (modified) (2 diffs)
• pslib.pc.in (modified) (1 diff)

trunk/psLib/pslib-config.in

@@ -3 +3 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
-includedir=@includedir@
+libdir=@libdir@
+includedir=@includedir@/@PACKAGE_NAME@
 top_srcdir=@ABS_SRCDIR@
 @PERL_INSTALLSYTLE@
@@ -60 +61 @@
 
     --cflags)
-        echo -I@includedir@ @PSLIB_CFLAGS@
+        echo -I${includedir} @PSLIB_CFLAGS@
         ;;
 
     --libs)
-        echo -L@libdir@ -lpslib @PSLIB_LIBS@
+        echo -L${libdir} -lpslib @PSLIB_LIBS@
         ;;
 

trunk/psLib/pslib.pc.in

@@ -2 +2 @@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
-includedir=@includedir@
+includedir=@includedir@/@PACKAGE_NAME@
 
-Name: psLib
+Name: @PACKAGE_NAME@
 Description: Pan-STARRS Library
 Version: @VERSION@
-Libs: -L@libdir@ -lpslib @PSLIB_LIBS@ @LIBS@
-Cflags: -I${includedir}/@PACKAGE_NAME@ @PSLIB_CFLAGS@
+Libs: -L${libdir} -lpslib @PSLIB_LIBS@
+Cflags: -I${includedir} @PSLIB_CFLAGS@