--- rpl/rplcas/Makefile.in	2012/04/13 13:51:49	1.28
+++ rpl/rplcas/Makefile.in	2012/07/03 09:24:21	1.30
@@ -59,7 +59,14 @@ lib/ntl.a:
 				CFLAGS="$(CFLAGS)" CXXFLAGS="@SYSROOT@ $(CXXFLAGS)" \
 				LDFLAGS="-L@SYSROOT2@/usr/lib"); \
 	fi
-	(cd @NTL@/src && $(MAKE) $(AM_MAKEFLAGS) -f makefile)
+	(cd @NTL@/src && \
+		if [ -z $(make -v | grep "^GNU Make") ]; then \
+				sed 's/make /gmake /g' makefile > makefile2 && \
+				\mv -f makefile2 makefile && \
+				sed 's/make /gmake /g' WizardAux > WizardAux2 && \
+				\mv -f WizardAux2 WizardAux;
+		fi && \
+		$(MAKE) $(AM_MAKEFLAGS) -f makefile)
 	cp @NTL@/src/ntl.a lib/ntl.a
 	cp @NTL@/src/ntl.a lib/ntl.a
 	cp -R @NTL@/include/NTL include
@@ -113,6 +120,7 @@ lib/@LIB_PREFIX@giac.a: lib/@LIB_PREFIX@
 		if [ @BUILD@ = @HOST@ ]; then \
 			(cd @GIAC@ && \
 					CPPFLAGS="-I$(top_builddir)/rplcas/include -I$(top_builddir)/tools/@GSL@ $(CPPFLAGS)" \
+					CXXFLAGS="$(CXXFLAGS) -fpermissive" \
 					LDFLAGS="-L$(top_builddir)/rplcas/lib $(LDFLAGS)" \
 					../$(srcdir)/@GIAC@/configure --prefix=$(top_builddir)/rplcas \
 					--enable-pari=$(top_builddir)/rplcas \
@@ -126,6 +134,7 @@ lib/@LIB_PREFIX@giac.a: lib/@LIB_PREFIX@
 		else \
 			(cd @GIAC@ && \
 					CPPFLAGS="-I$(top_builddir)/rplcas/include -I$(top_builddir)/tools/@GSL@ @SYSROOT@ $(CPPFLAGS)" \
+					CXXFLAGS="$(CXXFLAGS) -fpermissive" \
 					LDFLAGS="-L$(top_builddir)/rplcas/lib -L@SYSROOT2@/usr/lib $(LDFLAGS)" \
 					../$(srcdir)/@GIAC@/configure --prefix=$(top_builddir)/rplcas \
 					--host=@HOST@ \