Index: /trunk/psLib/configure.ac
===================================================================
--- /trunk/psLib/configure.ac	(revision 3236)
+++ /trunk/psLib/configure.ac	(revision 3237)
@@ -39,5 +39,4 @@
 dnl Setup the info for psLib for pkg-config
 PSLIB_CFLAGS="-I${includedir}"
-PSLIB_LIBS="-L${libdir} -lpslib"
 
 dnl ----------------- CFITSIO options --------------------
@@ -53,5 +52,5 @@
 [CFITSIO_LDFLAGS="-L$withval"])
 CFLAGS="${CFLAGS=} $CFITSIO_CFLAGS"
-LDFLAGS="${LDFLAGS} $CFITSIO_LDFLAGS -lcfitsio"
+dnl LDFLAGS="${LDFLAGS} $CFITSIO_LDFLAGS -lcfitsio"
 PSLIB_LIBS="${PSLIB_LIBS=} $CFITSIO_LDFLAGS -lcfitsio"
 AC_CHECK_HEADERS([fitsio.h],[],
@@ -70,5 +69,5 @@
 [FFTW3_LDFLAGS="-L$withval"])
 CFLAGS="${CFLAGS=} $FFTW3_CFLAGS"
-LDFLAGS="${LDFLAGS=} $FFTW3_LDFLAGS -lfftw3f"
+dnl LDFLAGS="${LDFLAGS=} $FFTW3_LDFLAGS -lfftw3f"
 PSLIB_LIBS="${PSLIB_LIBS=} $FFTW3_LDFLAGS -lfftw3f"
 AC_MSG_CHECKING([FFTW header files])
@@ -87,5 +86,5 @@
 AC_MSG_RESULT([${GSL_CFLAGS}])
 CFLAGS="${CFLAGS=} ${GSL_CFLAGS}"
-LDFLAGS="${LDFLAGS=} `${GSL_CONFIG} --libs`"
+dnl LDFLAGS="${LDFLAGS=} `${GSL_CONFIG} --libs`"
 PSLIB_LIBS="${PSLIB_LIBS=} `${GSL_CONFIG} --libs`"
    
@@ -101,5 +100,5 @@
 AC_MSG_RESULT([${XML_CFLAGS}])
 CFLAGS="${CFLAGS=} ${XML_CFLAGS}"
-LDFLAGS="${LDFLAGS=} `${XML_CONFIG} --libs`"
+dnl LDFLAGS="${LDFLAGS=} `${XML_CONFIG} --libs`"
 PSLIB_LIBS="${PSLIB_LIBS=} `${XML_CONFIG} --libs`"
 
Index: /trunk/psLib/pslib-config.in
===================================================================
--- /trunk/psLib/pslib-config.in	(revision 3236)
+++ /trunk/psLib/pslib-config.in	(revision 3237)
@@ -59,4 +59,8 @@
 
     --libs)
+       	echo -L@libdir@ -lpslib @PSLIB_LIBS@
+       	;;
+    
+    --deps)
        	echo @PSLIB_LIBS@
        	;;
Index: /trunk/psLib/pslib.pc.in
===================================================================
--- /trunk/psLib/pslib.pc.in	(revision 3236)
+++ /trunk/psLib/pslib.pc.in	(revision 3237)
@@ -7,4 +7,4 @@
 Description: Pan-STARRS Library
 Version: @VERSION@
-Libs: @PSLIB_LIBS@ -lpslib @LIBS@
+Libs: -L@libdir@ -lpslib @PSLIB_LIBS@ @LIBS@
 Cflags: @PSLIB_CFLAGS@
Index: /trunk/psLib/test/astronomy/Makefile.am
===================================================================
--- /trunk/psLib/test/astronomy/Makefile.am	(revision 3236)
+++ /trunk/psLib/test/astronomy/Makefile.am	(revision 3237)
@@ -11,5 +11,5 @@
 	$(all_includes)
 
-AM_LDFLAGS = -L$(top_builddir)/src $(PSLIB_LIBS)
+AM_LDFLAGS = -L$(top_builddir)/src -lpslib $(PSLIB_LIBS)
 AM_CFLAGS = -DXML_CONFIG_FILE="\"$(top_srcdir)/etc/pslib/psTime.xml\""
 
Index: /trunk/psLib/test/collections/Makefile.am
===================================================================
--- /trunk/psLib/test/collections/Makefile.am	(revision 3236)
+++ /trunk/psLib/test/collections/Makefile.am	(revision 3237)
@@ -13,5 +13,5 @@
 	$(all_includes)
 
-AM_LDFLAGS = -L$(top_builddir)/src $(PSLIB_LIBS)
+AM_LDFLAGS = -L$(top_builddir)/src -lpslib $(PSLIB_LIBS)
 
 check_PROGRAMS = \
Index: /trunk/psLib/test/dataIO/Makefile.am
===================================================================
--- /trunk/psLib/test/dataIO/Makefile.am	(revision 3236)
+++ /trunk/psLib/test/dataIO/Makefile.am	(revision 3237)
@@ -13,5 +13,5 @@
 	$(all_includes)
 
-AM_LDFLAGS = -L$(top_builddir)/src $(PSLIB_LIBS)
+AM_LDFLAGS = -L$(top_builddir)/src -lpslib $(PSLIB_LIBS)
 AM_CFLAGS = -DUTC_DAT_FILE="\"$(top_srcdir)/share/pslib/tai_utc.dat\""
 
Index: /trunk/psLib/test/dataManip/Makefile.am
===================================================================
--- /trunk/psLib/test/dataManip/Makefile.am	(revision 3236)
+++ /trunk/psLib/test/dataManip/Makefile.am	(revision 3237)
@@ -13,5 +13,5 @@
 	$(all_includes)
 
-AM_LDFLAGS = -L$(top_builddir)/src $(PSLIB_LIBS)
+AM_LDFLAGS = -L$(top_builddir)/src -lpslib $(PSLIB_LIBS)
 
 check_PROGRAMS = \
Index: /trunk/psLib/test/fileUtils/Makefile.am
===================================================================
--- /trunk/psLib/test/fileUtils/Makefile.am	(revision 3236)
+++ /trunk/psLib/test/fileUtils/Makefile.am	(revision 3237)
@@ -13,5 +13,5 @@
 	$(all_includes)
 
-AM_LDFLAGS = -L$(top_builddir)/src $(PSLIB_LIBS)
+AM_LDFLAGS = -L$(top_builddir)/src -lpslib $(PSLIB_LIBS)
 AM_CFLAGS = -DUTC_DAT_FILE="\"$(top_srcdir)/share/pslib/tai_utc.dat\""
 
Index: /trunk/psLib/test/image/Makefile.am
===================================================================
--- /trunk/psLib/test/image/Makefile.am	(revision 3236)
+++ /trunk/psLib/test/image/Makefile.am	(revision 3237)
@@ -13,5 +13,5 @@
 	$(all_includes)
 
-AM_LDFLAGS = -L$(top_builddir)/src $(PSLIB_LIBS)
+AM_LDFLAGS = -L$(top_builddir)/src -lpslib $(PSLIB_LIBS)
 
 check_PROGRAMS = \
Index: /trunk/psLib/test/sysUtils/Makefile.am
===================================================================
--- /trunk/psLib/test/sysUtils/Makefile.am	(revision 3236)
+++ /trunk/psLib/test/sysUtils/Makefile.am	(revision 3237)
@@ -13,5 +13,5 @@
 	$(all_includes)
 
-AM_LDFLAGS = -L$(top_builddir)/src $(PSLIB_LIBS)
+AM_LDFLAGS = -L$(top_builddir)/src -lpslib $(PSLIB_LIBS)
 
 check_PROGRAMS = \