--- rpl/rplcas/Makefile.in	2011/08/01 08:07:55	1.15
+++ rpl/rplcas/Makefile.in	2011/09/08 09:39:41	1.17
@@ -19,7 +19,8 @@ lib/libgmp.a:
 				--disable-shared --enable-static \
 				--prefix=$(top_builddir)/rplcas); \
 	fi
-	make -C @GMP@ $(AM_MAKEFLAGS) all && make -C $(AM_MAKEFLAGS) @GMP@ install
+	$(MAKE) -C @GMP@ $(AM_MAKEFLAGS) all && \
+			$(MAKE) -C $(AM_MAKEFLAGS) @GMP@ install
 
 lib/libmpfr.a: lib/libgmp.a
 	if [ ! -d @MPFR@ ]; then \
@@ -33,10 +34,15 @@ lib/libmpfr.a: lib/libgmp.a
 				--disable-shared --enable-static \
 				--prefix=$(top_builddir)/rplcas); \
 	fi
-	make -C @MPFR@ $(AM_MAKEFLAGS) all && make -C @MPFR@ $(AM_MAKEFLAGS) install
+	$(MAKE) -C @MPFR@ $(AM_MAKEFLAGS) all && \
+			$(MAKE) -C @MPFR@ $(AM_MAKEFLAGS) install
 
-lib/ntl.a:
-	CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" make -C @NTL@/src $(AM_MAKEFLAGS)
+@NTL@/src/makefile2: @NTL@/src/makefile
+	sed 's/\tmake/\t\$$(MAKE)/g' $< > $@
+	
+lib/ntl.a: @NTL@/src/makefile2
+	CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
+		   	$(MAKE) -C @NTL@/src $(AM_MAKEFLAGS) -f makefile2
 	cp @NTL@/src/ntl.a lib/ntl.a
 	cp @NTL@/src/ntl.a lib/ntl.a
 	cp -R @NTL@/include/NTL include
@@ -47,7 +53,7 @@ lib/libcocoa.a: lib/libgmp.a
 				./configure --with-libgmp=../lib/libgmp.a \
 				--with-libgsl=../../tools/@GSL@/.libs/libgsl.a); \
 	fi
-	make -C @COCOA@ $(AM_MAKEFLAGS) library
+	$(MAKE) -C @COCOA@ $(AM_MAKEFLAGS) library
 	cp @COCOA@/lib/libcocoa.a lib/libcocoa.a
 	cp -R @COCOA@/include/CoCoA include
 
@@ -59,8 +65,8 @@ lib/libpari.a: lib/libgmp.a
 		touch @PARI@/configured; \
 	fi
 	CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
-			make -C @PARI@ $(AM_MAKEFLAGS) gp && \
-			make -C @PARI@ $(AM_MAKEFLAGS) 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
@@ -86,10 +92,10 @@ lib/libgiac.a: lib/libgmp.a lib/libmpfr.
 				sed -e 's/#define HAVE_PNG_H 1//' > config.h && \
 				\rm -f config.h.orig); \
 	fi
-	make -C @GIAC@ $(AM_MAKEFLAGS) -f Makefile2
+	$(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
+	$(MAKE) -C @GIAC@ $(AM_MAKEFLAGS) install -f Makefile2
 
 lib/librplcas.a: lib/libgiac.a lib/libgmp.a lib/libmpfr.a
 	if [ ! -d tmp ]; then mkdir tmp; fi