--- rpl/rplcas/Makefile.in	2014/05/19 15:02:18	1.40
+++ rpl/rplcas/Makefile.in	2015/11/06 14:59:49	1.43
@@ -128,25 +128,25 @@ lib/@LIB_PREFIX@giac.a: lib/@LIB_PREFIX@
 				CXX=@CXX@ \
 				CPPFLAGS="-I$(top_builddir)/rplcas/include -I$(top_builddir)/tools/@GSL@ $(CPPFLAGS)" \
 				CXXFLAGS="$(CXXFLAGS) -fpermissive" \
-				LDFLAGS="-L$(top_builddir)/rplcas/lib $(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 $(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 \
+				--enable-pari \
+				--enable-ntl \
+				--enable-cocoa \
+				--enable-gsl \
 				--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)" \
+				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 $(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 \
+				--enable-pari \
+				--enable-ntl \
+				--enable-cocoa \
+				--enable-gsl \
 				--disable-shared --enable-static \
 				--disable-gui --without-x); \
 	fi; \
@@ -155,9 +155,6 @@ lib/@LIB_PREFIX@giac.a: lib/@LIB_PREFIX@
 			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); \
-	(cd $(srcdir)/@GIAC@ && \
-			sed -e 's/ doc / /' Makefile > Makefile2 && \
-			\mv -f Makefile2 Makefile); \
 	$(MAKE) -C @GIAC@ $(AM_MAKEFLAGS)
 	if [ x$(srcdir) != x. ]; then \
 		for i in mkinstalldirs xcas.xpm xcas.desktop xcas.applications; \
@@ -203,7 +200,7 @@ lib/librplcas.a: lib/@LIB_PREFIX@giac.a
 				done; \
 				if test -n "$$L"; then \
 					echo -n "Adding files to librplcas.a archive... "; \
-					ar cru ../lib/librplcas.a $$L; \
+					ar cr ../lib/librplcas.a $$L; \
 					rm -f $$L; \
 					echo "done"; \
 				fi; \