--- rpl/rplcas/Makefile.in	2012/07/29 20:38:23	1.32
+++ rpl/rplcas/Makefile.in	2012/12/13 21:58:17	1.36
@@ -73,7 +73,7 @@ lib/ntl.a:
 	cp -R @NTL@/include/NTL include
 
 lib/libcocoa.a: lib/@LIB_PREFIX@gmp.a
-	sed '1,1/^#!\/bin\/bash/@BASH@/g' @COCOA@/configure > @COCOA@/configure2
+	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 \
@@ -89,7 +89,7 @@ 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 \
+	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
@@ -126,6 +126,7 @@ lib/@LIB_PREFIX@giac.a: lib/@LIB_PREFIX@
 	if [ ! -f @GIAC@/Makefile2 ]; then \
 		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)" \
@@ -136,7 +137,8 @@ lib/@LIB_PREFIX@giac.a: lib/@LIB_PREFIX@
 					--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 \
+					sed 's/SUBDIRS = src check intl po debianold debian doc examples/SUBDIRS = src check intl po debianold debian/g' Makefile | \
+					sed 's/DIST_SUBDIRS = src check intl po debianold debian doc examples/SUBDIRS = src check intl po debianold debian/g' \
 					> Makefile2); \
 		else \
 			(cd @GIAC@ && \
@@ -151,7 +153,7 @@ lib/@LIB_PREFIX@giac.a: lib/@LIB_PREFIX@
 					--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 \
+					sed 's/SUBDIRS = src check intl po debianold debian doc examples/SUBDIRS = src/g' Makefile \
 					> Makefile2); \
 		fi; \
 		(cd @GIAC@/src && \