Index: trunk/psLib/swig/Makefile.am
===================================================================
--- trunk/psLib/swig/Makefile.am	(revision 3132)
+++ trunk/psLib/swig/Makefile.am	(revision 3145)
@@ -5,11 +5,12 @@
 	rm -rf psLibModule
 
-INCLUDES = -I$(top_srcdir)/src \
-	-I$(top_srcdir)/src/astronomy \
-	-I$(top_srcdir)/src/collections \
-	-I$(top_srcdir)/src/dataManip \
-	-I$(top_srcdir)/src/fileUtils \
-	-I$(top_srcdir)/src/image \
-	-I$(top_srcdir)/src/sysUtils
+SRCDIR = $(shell cd $(top_srcdir) && pwd)
+INCLUDES = -I$(SRCDIR)/src \
+	-I$(SRCDIR)/src/astronomy \
+	-I$(SRCDIR)/src/collections \
+	-I$(SRCDIR)/src/dataManip \
+	-I$(SRCDIR)/src/fileUtils \
+	-I$(SRCDIR)/src/image \
+	-I$(SRCDIR)/src/sysUtils
 
 ####################################################
@@ -25,5 +26,5 @@
 	echo "includes=$(INCLUDES)" > psLibModule/setup.txt
 	echo "ldflags=-L$(top_builddir)/src $(PSLIB_LIBS)" >> psLibModule/setup.txt
-	echo "cflags=$(PSLIB_CFLAGS) -Wno-unused -Wno-strict-aliasing" >> psLibModule/setup.txt
+	echo "cflags=$(CFLAGS) -std=c99 -Wno-unused -Wno-strict-aliasing" >> psLibModule/setup.txt
 
 psLibModule/pslib_wrap.c: psLibModule pslib.i