Index: /trunk/psLib/pslib-config.in
===================================================================
--- /trunk/psLib/pslib-config.in	(revision 8987)
+++ /trunk/psLib/pslib-config.in	(revision 8988)
@@ -3,5 +3,6 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
-includedir=@includedir@
+libdir=@libdir@
+includedir=@includedir@/@PACKAGE_NAME@
 top_srcdir=@ABS_SRCDIR@
 @PERL_INSTALLSYTLE@
@@ -60,9 +61,9 @@
 
     --cflags)
-       	echo -I@includedir@ @PSLIB_CFLAGS@
+       	echo -I${includedir} @PSLIB_CFLAGS@
        	;;
 
     --libs)
-       	echo -L@libdir@ -lpslib @PSLIB_LIBS@
+       	echo -L${libdir} -lpslib @PSLIB_LIBS@
        	;;
 
Index: /trunk/psLib/pslib.pc.in
===================================================================
--- /trunk/psLib/pslib.pc.in	(revision 8987)
+++ /trunk/psLib/pslib.pc.in	(revision 8988)
@@ -2,9 +2,9 @@
 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@