--- rpl/rplcas/Makefile.in	2011/04/21 12:55:37	1.4
+++ rpl/rplcas/Makefile.in	2011/04/21 15:59:43	1.5
@@ -14,7 +14,7 @@ lib/libgmp.a:
 				--disable-shared --enable-static \
 				--prefix=$(top_builddir)/rplcas); \
 	fi
-	make -C @GMP@ all && make -C @GMP@ install
+	make -C @GMP@ $(AM_MAKEFLAGS) all && make -C $(AM_MAKEFLAGS) @GMP@ install
 
 lib/libmpfr.a: lib/libgmp.a
 	if [ ! -d @MPFR@ ]; then \
@@ -26,10 +26,10 @@ lib/libmpfr.a: lib/libgmp.a
 				--disable-shared --enable-static \
 				--prefix=$(top_builddir)/rplcas); \
 	fi
-	make -C @MPFR@ all && make -C @MPFR@ install
+	make -C @MPFR@ $(AM_MAKEFLAGS) all && make -C @MPFR@ $(AM_MAKEFLAGS) install
 
 lib/ntl.a:
-	make -C @NTL@/src
+	make -C @NTL@/src $(AM_MAKEFLAGS)
 	cp @NTL@/src/ntl.a lib/ntl.a
 	cp @NTL@/src/ntl.a lib/ntl.a
 	cp -R @NTL@/include/NTL include
@@ -39,7 +39,7 @@ lib/libcocoa.a: lib/libgmp.a
 		(cd @COCOA@ && ./configure --with-libgmp=../lib/libgmp.a \
 				--with-libgsl=../../tools/@GSL@/.libs/libgsl.a); \
 	fi
-	make -C @COCOA@ library
+	make -C @COCOA@ $(AM_MAKEFLAGS) library
 	cp @COCOA@/lib/libcocoa.a lib/libcocoa.a
 	cp -R @COCOA@/include/CoCoA include
 
@@ -50,7 +50,7 @@ lib/libpari.a: lib/libgmp.a
 				--without-readline --graphic=none -s); \
 		touch @PARI@/configured; \
 	fi
-	make -C @PARI@ gp && make -C @PARI@ install
+	make -C @PARI@ $(AM_MAKEFLAGS) gp && make -C @PARI@ $(AM_MAKEFLAGS) install
 
 lib/libgiac.a: lib/libgmp.a lib/libmpfr.a lib/ntl.a \
 		lib/libcocoa.a lib/libpari.a
@@ -58,16 +58,23 @@ lib/libgiac.a: lib/libgmp.a lib/libmpfr.
 		mkdir @GIAC@ ; \
 	fi
 	if [ ! -f @GIAC@/config.log ]; then \
-		(cd @GIAC@ && CPPFLAGS="-I../include $(CPPFLAGS)" \
-				LDFLAGS="-L../lib $(LDFLAGS)" \
+		(cd @GIAC@ && \
+				CPPFLAGS="-I$(top_builddir)/rplcas/lib/include $(CPPFLAGS)" \
+				LDFLAGS="-L$(top_builddir)/rplcas/lib $(LDFLAGS)" \
 				../$(srcdir)/@GIAC@/configure --prefix=$(top_builddir)/rplcas \
 				--enable-pari=$(top_builddir)/rplcas \
 				--enable-ntl=$(top_builddir)/rplcas \
 				--enable-cocoa=$(top_builddir)/rplcas \
 				--enable-gsl=../../tools/@GSL@/.libs/libgsl.a \
-				--disable-gui --without-x); \
-	fi
-	make -C @GIAC@ && make -C @GIAC@ install
+				--disable-shared --enable-static \
+				--disable-gui --without-x && \
+				sed 's/SUBDIRS = src check intl po debianold debian doc examples/SUBDIRS = src check intl po debianold debian/g' Makefile | \
+				> Makefile2); \
+	fi
+	make -C @GIAC@ $(AM_MAKEFLAGS) -f Makefile2
+	for i in mkinstalldirs xcas.xpm xcas.desktop xcas.applications; \
+	do cp $(srcdir)/@GIAC@/$$i @GIAC@/$$i; done
+	make -C @GIAC@ $(AM_MAKEFLAGS) install -f Makefile2
 
 install: all