--- rpl/rplcas/Makefile.in	2015/11/10 11:12:26	1.45
+++ rpl/rplcas/Makefile.in	2019/01/07 06:02:59	1.51
@@ -17,7 +17,7 @@ lib/@LIB_PREFIX@gmp.a:
 		(cd @GMP@ && \
 				CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
 				../$(srcdir)/@GMP@/configure --with-readline=no \
-				--host=@HOST@ \
+				--host=@HOST@ --enable-cxx \
 				--disable-shared --enable-static \
 				--prefix=$(top_builddir)/rplcas); \
 	fi
@@ -79,11 +79,11 @@ lib/@LIB_PREFIX@mpfi.a: lib/@LIB_PREFIX@
 lib/ntl.a:
 	if [ @BUILD@ = @HOST@ ]; then \
 		(cd @NTL@/src && ./configure GMP_PREFIX=$(top_builddir)/rplcas \
-				SHARED=off CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)"); \
+				SHARED=off CXXFLAGS="$(CXXFLAGS)"); \
 	else \
 		(cd @NTL@/src && ./configure GMP_PREFIX=$(top_builddir)/rplcas \
 				SHARED=off CC=@HOST@-gcc CXX=@HOST@-g++ \
-				CFLAGS="$(CFLAGS)" CXXFLAGS="@SYSROOT@ $(CXXFLAGS)" \
+				CXXFLAGS="@SYSROOT@ $(CXXFLAGS)" \
 				LDFLAGS="-L@SYSROOT2@/usr/lib"); \
 	fi
 	(cd @NTL@/src && \
@@ -100,9 +100,13 @@ 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
+#	MakeUnifiedHeader.sh (interpreter)
+	for i in $(shell find @COCOA@ -name "*" -exec grep /bin/bash {} /dev/null \;); \
+	do
+		sed '1,1s/^#! *\/bin\/bash/#!@BASH@/g' $$i > $$i.2; \
+		mv -f $$i.2 $$i; \
+		chmod 755 $$i; \
+	done;
 	if [ ! -f @COCOA@/configuration/autoconf.mk ]; then \
 		if [ @BUILD@ = @HOST@ ]; then \
 			(cd @COCOA@ && CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
@@ -116,9 +120,6 @@ 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
@@ -140,6 +141,9 @@ lib/libpari.a: lib/@LIB_PREFIX@gmp.a
 					--with-gmp=../lib/libgmp.a \
 					--without-readline --graphic=none -s); \
 		fi; \
+		(cd @PARI@ && \
+				sed -i -e 's/perl/perl -I./g' \
+						$$(find . -maxdepth 1 -name "O*")/Makefile); \
 		touch @PARI@/configured; \
 	fi
 	$(MAKE) -C @PARI@ $(AM_MAKEFLAGS) gp && \