Index: /trunk/psLib/configure.in
===================================================================
--- /trunk/psLib/configure.in	(revision 3121)
+++ /trunk/psLib/configure.in	(revision 3122)
@@ -1,4 +1,5 @@
 AC_INIT(configure.in)
 SHARED_VERSION_INFO="1:5:0"
+AC_DISABLE_STATIC
 
 AM_CONFIG_HEADER(src/config.h)
@@ -8,6 +9,4 @@
 AC_PROG_CC
 AC_PROG_INSTALL
-AC_PROG_LIBTOOL
-AC_DISABLE_STATIC
 AC_PROG_LIBTOOL
 
Index: /trunk/psLib/src/Makefile.am
===================================================================
--- /trunk/psLib/src/Makefile.am	(revision 3121)
+++ /trunk/psLib/src/Makefile.am	(revision 3122)
@@ -27,2 +27,7 @@
 
 EXTRA_DIST = parseErrorCodes.pl mainpage.dox Doxyfile psErrorCodes.dat psTest.h
+
+pslibincludedir = $(includedir)
+pslibinclude_HEADERS = \
+	psTest.h \
+	pslib.h
Index: /trunk/psLib/src/astronomy/Makefile.am
===================================================================
--- /trunk/psLib/src/astronomy/Makefile.am	(revision 3121)
+++ /trunk/psLib/src/astronomy/Makefile.am	(revision 3122)
@@ -27,5 +27,5 @@
 	perl $(top_srcdir)/src/parseErrorCodes.pl --data=$? $@
 
-pslibincludedir = $(includedir)/pslib
+pslibincludedir = $(includedir)
 pslibinclude_HEADERS = \
 	psTime.h \
Index: /trunk/psLib/src/collections/Makefile.am
===================================================================
--- /trunk/psLib/src/collections/Makefile.am	(revision 3121)
+++ /trunk/psLib/src/collections/Makefile.am	(revision 3122)
@@ -26,5 +26,5 @@
 	perl $(top_srcdir)/src/parseErrorCodes.pl --data=$? $@
 
-pslibincludedir = $(includedir)/pslib
+pslibincludedir = $(includedir)
 pslibinclude_HEADERS = \
 	psBitSet.h \
Index: /trunk/psLib/src/dataIO/Makefile.am
===================================================================
--- /trunk/psLib/src/dataIO/Makefile.am	(revision 3121)
+++ /trunk/psLib/src/dataIO/Makefile.am	(revision 3122)
@@ -21,5 +21,5 @@
 	perl $(top_srcdir)/src/parseErrorCodes.pl --data=$? $@
 
-pslibincludedir = $(includedir)/pslib
+pslibincludedir = $(includedir)
 pslibinclude_HEADERS = \
 	psLookupTable.h \
Index: /trunk/psLib/src/dataManip/Makefile.am
===================================================================
--- /trunk/psLib/src/dataManip/Makefile.am	(revision 3121)
+++ /trunk/psLib/src/dataManip/Makefile.am	(revision 3122)
@@ -26,5 +26,5 @@
 	perl $(top_srcdir)/src/parseErrorCodes.pl --data=$? $@
 
-pslibincludedir = $(includedir)/pslib
+pslibincludedir = $(includedir)
 pslibinclude_HEADERS = \
 	psConstants.h \
Index: /trunk/psLib/src/fileUtils/Makefile.am
===================================================================
--- /trunk/psLib/src/fileUtils/Makefile.am	(revision 3121)
+++ /trunk/psLib/src/fileUtils/Makefile.am	(revision 3122)
@@ -21,5 +21,5 @@
 	perl $(top_srcdir)/src/parseErrorCodes.pl --data=$? $@
 
-pslibincludedir = $(includedir)/pslib
+pslibincludedir = $(includedir)
 pslibinclude_HEADERS = \
 	psLookupTable.h \
Index: /trunk/psLib/src/image/Makefile.am
===================================================================
--- /trunk/psLib/src/image/Makefile.am	(revision 3121)
+++ /trunk/psLib/src/image/Makefile.am	(revision 3122)
@@ -26,5 +26,5 @@
 	perl $(top_srcdir)/src/parseErrorCodes.pl --data=$? $@
 
-pslibincludedir = $(includedir)/pslib
+pslibincludedir = $(includedir)
 pslibinclude_HEADERS = \
 	psImage.h \
Index: /trunk/psLib/src/sysUtils/Makefile.am
===================================================================
--- /trunk/psLib/src/sysUtils/Makefile.am	(revision 3121)
+++ /trunk/psLib/src/sysUtils/Makefile.am	(revision 3122)
@@ -27,5 +27,5 @@
 	perl $(top_srcdir)/src/parseErrorCodes.pl --data=$? $@
 
-pslibincludedir = $(includedir)/pslib
+pslibincludedir = $(includedir)
 pslibinclude_HEADERS = \
 	psType.h       \
Index: /trunk/psLib/swig/Makefile.am
===================================================================
--- /trunk/psLib/swig/Makefile.am	(revision 3121)
+++ /trunk/psLib/swig/Makefile.am	(revision 3122)
@@ -20,5 +20,5 @@
 PsLibModule/setup.txt:Makefile
 	echo "includes=$(INCLUDES)" > PsLibModule/setup.txt
-	echo "ldflags=-L$(libdir) -lpslib" >> PsLibModule/setup.txt
+	echo "ldflags=$(libdir)/libpslib" >> PsLibModule/setup.txt
 	echo "cflags=-Wno-unused -Wno-strict-aliasing" >> PsLibModule/setup.txt
 
@@ -34,8 +34,6 @@
 	cd PsLibModule && make
 
-swig-install: PsLibModule-build
+swig-install: swig
 	cd PsLibModule && make install
-
-install-exec-hook: swig swig-install
 
 uninstall-local: PsLibModule/Makefile