--- rpl/rplcas/Makefile.in	2012/07/30 07:26:12	1.33
+++ rpl/rplcas/Makefile.in	2012/12/13 21:58:17	1.36
@@ -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 && \