Index: trunk/psLib/src/astro/Makefile.am
===================================================================
--- trunk/psLib/src/astro/Makefile.am	(revision 4446)
+++ trunk/psLib/src/astro/Makefile.am	(revision 4502)
@@ -3,16 +3,5 @@
 AM_CFLAGS=$(CFLAGS) -DPS_CONFIG_FILE_DEFAULT=\"$(sysconfdir)/pslib/psTime.config\"
 
-INCLUDES = \
-	-I$(top_srcdir)/src/astro \
-	-I$(top_srcdir)/src/db \
-	-I$(top_srcdir)/src/fft \
-	-I$(top_srcdir)/src/fits \
-	-I$(top_srcdir)/src/imageops \
-	-I$(top_srcdir)/src/math \
-	-I$(top_srcdir)/src/mathtypes \
-	-I$(top_srcdir)/src/sys \
-	-I$(top_srcdir)/src/types \
-	-I$(top_srcdir)/src/xml \
-	$(all_includes)
+INCLUDES = `echo "$(SRCLIBS} | sed sed "s|\(\\w\+\)|-I\$(top_builddir)/src/\1|g"`
 
 noinst_LTLIBRARIES = libpslibastro.la
@@ -23,7 +12,7 @@
 BUILT_SOURCES = psAstroErrors.h
 
-EXTRA_DIST = psAstroErrors.dat astro.i
+EXTRA_DIST = psAstroErrors_$(LANG).dat astro.i
 
-psAstroErrors.h: psAstroErrors.dat
+psAstroErrors.h: psAstroErrors_$(LANG).dat
 	$(top_srcdir)/src/psParseErrorCodes --data=$? $@