--- rpl/rplcas/Makefile.in	2012/07/03 09:24:21	1.30
+++ rpl/rplcas/Makefile.in	2012/12/14 12:30:35	1.37
@@ -60,11 +60,12 @@ lib/ntl.a:
 				LDFLAGS="-L@SYSROOT2@/usr/lib"); \
 	fi
 	(cd @NTL@/src && \
-		if [ -z $(make -v | grep "^GNU Make") ]; then \
+		if [ -z '$(make -v | grep "^GNU Make")' -a $(shell uname) != Linux ]; \
+					then \
 				sed 's/make /gmake /g' makefile > makefile2 && \
 				\mv -f makefile2 makefile && \
 				sed 's/make /gmake /g' WizardAux > WizardAux2 && \
-				\mv -f WizardAux2 WizardAux;
+				\mv -f WizardAux2 WizardAux; \
 		fi && \
 		$(MAKE) $(AM_MAKEFLAGS) -f makefile)
 	cp @NTL@/src/ntl.a lib/ntl.a
@@ -72,6 +73,9 @@ lib/ntl.a:
 	cp -R @NTL@/include/NTL include
 
 lib/libcocoa.a: lib/@LIB_PREFIX@gmp.a
+	sed '1,1s/^#!\/bin\/bash/#!@BASH@/g' @COCOA@/configure > @COCOA@/configure2
+	mv -f @COCOA@/configure2 @COCOA@/configure
+	chmod 755 @COCOA@/configure
 	if [ ! -f @COCOA@/configuration/autoconf.mk ]; then \
 		if [ @BUILD@ = @HOST@ ]; then \
 			(cd @COCOA@ && CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
@@ -85,6 +89,9 @@ lib/libcocoa.a: lib/@LIB_PREFIX@gmp.a
 					--with-libgsl=../../tools/@GSL@/.libs/libgsl.a); \
 		fi; \
 	fi
+	sed 's/^SHELL=\/bin\/bash/SHELL=@BASH@/g' @COCOA@/configuration/autoconf.mk \
+			> @COCOA@/configuration/autoconf.mk2
+	mv -f @COCOA@/configuration/autoconf.mk2 @COCOA@/configuration/autoconf.mk
 	$(MAKE) -C @COCOA@ $(AM_MAKEFLAGS) library
 	cp @COCOA@/lib/libcocoa.a lib/libcocoa.a
 	cp -R @COCOA@/include/CoCoA include
@@ -116,49 +123,44 @@ lib/@LIB_PREFIX@giac.a: lib/@LIB_PREFIX@
 	if [ ! -d @GIAC@ ]; then \
 		mkdir @GIAC@ ; \
 	fi
-	if [ ! -f @GIAC@/Makefile2 ]; then \
-		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 \
-					--enable-ntl=$(top_builddir)/rplcas \
-					--enable-cocoa=$(top_builddir)/rplcas \
-					--enable-gsl=$(top_builddir)/tools/@GSL@/.libs/libgsl.a \
-					--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); \
-		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@ \
-					--enable-pari=$(top_builddir)/rplcas \
-					--enable-ntl=$(top_builddir)/rplcas \
-					--enable-cocoa=$(top_builddir)/rplcas \
-					--enable-gsl=$(top_builddir)/tools/@GSL@/.libs/libgsl.a \
-					--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; \
-		(cd @GIAC@/src && \
-				mv -f config.h config.h.orig && \
-				sed -e 's/#define HAVE_LIBPNG 1//' config.h.orig | \
-				sed -e 's/#define HAVE_PNG_H 1//' > config.h && \
-				rm -f config.h.orig); \
-	fi
-	$(MAKE) -C @GIAC@ $(AM_MAKEFLAGS) -f Makefile2
+	if [ @BUILD@ = @HOST@ ]; then \
+		(cd @GIAC@ && \
+				CXX=@CXX@ \
+				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 \
+				--enable-ntl=$(top_builddir)/rplcas \
+				--enable-cocoa=$(top_builddir)/rplcas \
+				--enable-gsl=$(top_builddir)/tools/@GSL@/.libs/libgsl.a \
+				--disable-shared --enable-static \
+				--disable-gui --without-x); \
+	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@ \
+				--enable-pari=$(top_builddir)/rplcas \
+				--enable-ntl=$(top_builddir)/rplcas \
+				--enable-cocoa=$(top_builddir)/rplcas \
+				--enable-gsl=$(top_builddir)/tools/@GSL@/.libs/libgsl.a \
+				--disable-shared --enable-static \
+				--disable-gui --without-x); \
+	fi; \
+	(cd @GIAC@/src && \
+			mv -f config.h config.h.orig && \
+			sed -e 's/#define HAVE_LIBPNG 1//' config.h.orig | \
+			sed -e 's/#define HAVE_PNG_H 1//' > config.h && \
+			rm -f config.h.orig); \
+	$(MAKE) -C @GIAC@ $(AM_MAKEFLAGS)
 	if [ x$(srcdir) != x. ]; then \
 		for i in mkinstalldirs xcas.xpm xcas.desktop xcas.applications; \
 				do cp $(srcdir)/@GIAC@/$$i @GIAC@/$$i; done; \
 	fi
-	$(MAKE) -C @GIAC@ $(AM_MAKEFLAGS) install -f Makefile2
+	$(MAKE) -C @GIAC@ $(AM_MAKEFLAGS) install
 
 lib/librplcas.a: lib/@LIB_PREFIX@giac.a lib/@LIB_PREFIX@gmp.a \
 		lib/@LIB_PREFIX@mpfr.a lib/ntl.a lib/libcocoa.a lib/libpari.a