Index: trunk/psLib/swig/Makefile.am
===================================================================
--- trunk/psLib/swig/Makefile.am	(revision 3122)
+++ trunk/psLib/swig/Makefile.am	(revision 3123)
@@ -1,11 +1,8 @@
-# not a GNU package. You can remove this line, if
-# have all needed files, that a GNU package needs
-AUTOMAKE_OPTIONS = foreign 1.4
 
-EXTRA_DIST = PsLib.i PsLibModule/Makefile.PL
+EXTRA_DIST = pslib.i psLibModule/Makefile.PL
 
-CLEANFILES = PsLibModule/PsLib_wrap.c PsLibModule/PsLib.pm \
-PsLibModule/Makefile PsLibModule/pm_to_blib PsLibModule/PsLib.bs \
-PsLibModule/PsLib_wrap.o PsLibModule/setup.txt
+CLEANFILES = psLibModule/pslib_wrap.c psLibModule/pslib.pm \
+psLibModule/Makefile psLibModule/pm_to_blib psLibModule/pslib.bs \
+psLibModule/pslib_wrap.o psLibModule/setup.txt
 
 SRCDIR = $(shell cd $(top_srcdir)/src && pwd)
@@ -18,23 +15,21 @@
 ## PsLibModule swig build section.  
 
-PsLibModule/setup.txt:Makefile
-	echo "includes=$(INCLUDES)" > PsLibModule/setup.txt
-	echo "ldflags=$(libdir)/libpslib" >> PsLibModule/setup.txt
-	echo "cflags=-Wno-unused -Wno-strict-aliasing" >> PsLibModule/setup.txt
+psLibModule/setup.txt:Makefile
+	echo "includes=$(INCLUDES)" > psLibModule/setup.txt
+	echo "ldflags=$(PSLIB_LIBS)" >> psLibModule/setup.txt
+	echo "cflags=$(PSLIB_CFLAGS) -Wno-unused -Wno-strict-aliasing" >> psLibModule/setup.txt
 
-PsLibModule/PsLib_wrap.c: PsLib.i
+psLibModule/pslib_wrap.c: pslib.i
 	$(SWIG) -perl $(INCLUDES) -w451 -o $@ $?
 
-PsLibModule/Makefile:PsLibModule/Makefile.PL PsLibModule/setup.txt
-	cd PsLibModule && $(PERL) Makefile.PL
+psLibModule/Makefile:psLibModule/Makefile.PL psLibModule/setup.txt
+	cd psLibModule && $(PERL) Makefile.PL PREFIX=$(PERL_PREFIX)
 
-all: PsLibModule/PsLib_wrap.c
+all:psLibModule/pslib_wrap.c psLibModule/Makefile
+	cd psLibModule && make
 
-swig:PsLibModule/PsLib_wrap.c PsLibModule/Makefile
-	cd PsLibModule && make
+install-exec-hook: all
+	cd psLibModule && make install
 
-swig-install: swig
-	cd PsLibModule && make install
-
-uninstall-local: PsLibModule/Makefile
+uninstall-local: psLibModule/Makefile
 	cd PsLibModule && make clean