--- rpl/rplcas/Makefile.in	2019/01/07 06:13:33	1.52
+++ rpl/rplcas/Makefile.in	2019/02/22 17:02:14	1.58
@@ -100,31 +100,24 @@ lib/ntl.a:
 	cp -R @NTL@/include/NTL include
 
 lib/libcocoa.a: lib/@LIB_PREFIX@gmp.a
-for i in $(shell find @COCOA@ -name "*" -exec grep /bin/bash {} /dev/null \; | cut -d: -f1); \
-	do
+	for i in $(shell find @COCOA@ -name "*" -exec grep /bin/bash {} /dev/null \; | cut -d: -f1); \
+	do \
 		sed '1,1s/^#! *\/bin\/bash/#!@BASH@/g' $$i > $$i.2; \
-		mv -f $$i.2 $$i; \
+		sed '1,$$s/SHELL=\/bin\/bash/SHELL=@BASH@/g' $$i.2 > $$i; \
+		\rm -f $$i.2; \
 		chmod 755 $$i; \
-	done;
-	sed 's/^SHELL=\/bin\/bash/SHELL=@BASH@/g' \
-		@COCOE@/configuration/autoconf.mk \
-		> @COCOA@/configuration/autoconf.mk2
-	mv -f @COCOE@/configuration/autoconf.mk2 \
-		> @COCOA@/configuration/autoconf.mk
-	chmod 755 @COCOA@/configuration/autoconf.mk
-	if [ ! -f @COCOA@/configuration/autoconf.mk ]; then \
-		if [ @BUILD@ = @HOST@ ]; then \
-			(cd @COCOA@ && CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
-					./configure --with-libgmp=../lib/libgmp.a \
-					--with-libgsl=../../tools/@GSL@/.libs/libgsl.a); \
-		else \
-			(cd @COCOA@ && CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
-					./configure --with-libgmp=../lib/libgmp.a \
-					--with-cxx=@HOST@-g++ \
-					--with-cxxflags="@SYSROOT@ $(CXXFLAGS)" \
-					--with-libgsl=../../tools/@GSL@/.libs/libgsl.a); \
-		fi; \
-	fi
+	done
+	if [ @BUILD@ = @HOST@ ]; then \
+		(cd @COCOA@ && CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
+				./configure --with-libgmp=../lib/libgmp.a \
+				--with-libgsl=../../tools/@GSL@/.libs/libgsl.a); \
+	else \
+		(cd @COCOA@ && CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
+				./configure --with-libgmp=../lib/libgmp.a \
+				--with-cxx=@HOST@-g++ \
+				--with-cxxflags="@SYSROOT@ $(CXXFLAGS)" \
+				--with-libgsl=../../tools/@GSL@/.libs/libgsl.a); \
+	fi; \
 	$(MAKE) -C @COCOA@ $(AM_MAKEFLAGS) library
 	cp @COCOA@/lib/libcocoa.a lib/libcocoa.a
 	cp -R @COCOA@/include/CoCoA include
@@ -176,7 +169,7 @@ lib/@LIB_PREFIX@giac.a: lib/@LIB_PREFIX@
 		(cd @GIAC@ && \
 				CPPFLAGS="-I$(top_builddir)/rplcas/include -I$(top_builddir)/tools/@GSL@ @SYSROOT@ $(CPPFLAGS)" \
 				CXXFLAGS="$(CXXFLAGS) -fpermissive" \
-				LDFLAGS="$(top_builddir)/rplcas/lib/libpari.a $(top_builddir)/rplcas/lib/ntl.a $(top_builddir)/rplcas/lib/libcocoa.a $(top_builddir)/tools/@GSL@/.libs/libgsl.a $(top_builddir)/rplcas/lib/@LIB_PREFIX@gmp.a $(top_builddir)/rplcas/lib/@LIB_PREFIX@mpfr.a $(top_builddir)/rplcas/lib/@LIB_PREFIX@mpfi.a $(LDFLAGS)" \
+				LDFLAGS="$(top_builddir)/rplcas/lib/libpari.a $(top_builddir)/rplcas/lib/ntl.a $(top_builddir)/rplcas/lib/libcocoa.a $(top_builddir)/tools/@GSL@/.libs/libgsl.a $(top_builddir)/rplcas/lib/@LIB_PREFIX@gmp.a $(top_builddir)/rplcas/lib/@LIB_PREFIX@mpfr.a $(top_builddir)/rplcas/lib/@LIB_PREFIX@mpfi.a $(LDFLAGS) $(LIBGIAC)" \
 				../$(srcdir)/@GIAC@/configure --prefix=$(top_builddir)/rplcas \
 				--host=@HOST@ \
 				--enable-pari \