Index: trunk/psLib/configure.ac
===================================================================
--- trunk/psLib/configure.ac	(revision 4541)
+++ trunk/psLib/configure.ac	(revision 4549)
@@ -14,5 +14,12 @@
 SUBDIR="etc src test" dnl don't include 'swig', as it is optional
 
+SRCPATH="`pwd`/src"
 SRCDIRS="sys astro db fft fits imageops math mathtypes types xml"
+SRCINC=`echo "${SRCDIRS=}" | sed "s|\(\\w\+\)|-I\${SRCPATH=}/\1|g"`
+
+SRCSUBLIBS=`echo "${SRCDIRS=}" | sed "s|\(\\w\+\)|\1/libpslib\1.la|g"`
+AC_SUBST(SRCSUBLIBS,${SRCSUBLIBS=})
+CFLAGS="${CFLAGS=} -I${SRCPATH=} ${SRCINC=}"
+AC_SUBST(SRCINC,${SRCINC=})
 
 AC_DISABLE_STATIC
@@ -74,10 +81,4 @@
 
 dnl Add the src directories to the include path
-SRCPATH="`pwd`/src"
-SRCINC=`echo "${SRCDIRS=}" | sed "s|\(\\w\+\)|-I\${SRCPATH=}/\1|g"`
-SRCSUBLIBS=`echo "${SRCDIRS=}" | sed "s|\(\\w\+\)|\1/libpslib\1.la|g"`
-AC_SUBST(SRCSUBLIBS,${SRCSUBLIBS=})
-CFLAGS="${CFLAGS=} -I${SRCPATH=} ${SRCINC=}"
-AC_SUBST(SRCINC,${SRCINC=})
 
 
@@ -253,9 +254,10 @@
 AC_SUBST(PSLIB_CFLAGS,[$PSLIB_CFLAGS])
 
-AC_SUBST(LANG,[en])
+AC_SUBST(PS_LANG,[en])
 
 AC_CONFIG_FILES([
   Makefile
   src/Makefile
+  src/sys/Makefile
   src/astro/Makefile
   src/db/Makefile
@@ -265,15 +267,18 @@
   src/math/Makefile
   src/mathtypes/Makefile
-  src/sys/Makefile
   src/types/Makefile
   src/xml/Makefile
+  test/Makefile
+  test/sys/Makefile
+  test/astro/Makefile
+  test/db/Makefile
+  test/fft/Makefile
+  test/fits/Makefile
+  test/imageops/Makefile
+  test/math/Makefile
+  test/mathtypes/Makefile
+  test/types/Makefile
+  test/xml/Makefile
   test/FullUnitTest
-  test/Makefile
-  test/astronomy/Makefile
-  test/collections/Makefile
-  test/dataManip/Makefile
-  test/dataIO/Makefile
-  test/image/Makefile
-  test/sysUtils/Makefile
   etc/pslib/Makefile
   etc/Makefile