--- rpl/rplcas/Makefile.in	2011/09/07 18:53:53	1.16
+++ rpl/rplcas/Makefile.in	2011/09/21 10:08:47	1.23
@@ -38,8 +38,9 @@ lib/libmpfr.a: lib/libgmp.a
 			$(MAKE) -C @MPFR@ $(AM_MAKEFLAGS) install
 
 lib/ntl.a:
-	CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
-		   	$(MAKE) -C @NTL@/src $(AM_MAKEFLAGS)
+	(cd @NTL@/src && ./configure)
+	(cd @NTL@/src && CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
+		   	$(MAKE) $(AM_MAKEFLAGS) -f makefile)
 	cp @NTL@/src/ntl.a lib/ntl.a
 	cp @NTL@/src/ntl.a lib/ntl.a
 	cp -R @NTL@/include/NTL include
@@ -70,9 +71,9 @@ lib/libgiac.a: lib/libgmp.a lib/libmpfr.
 	if [ ! -d @GIAC@ ]; then \
 		mkdir @GIAC@ ; \
 	fi
-	if [ ! -f @GIAC@/config.log ]; then \
+	if [ ! -f @GIAC@/Makefile2 ]; then \
 		(cd @GIAC@ && \
-				CPPFLAGS="-I$(top_builddir)/rplcas/lib/include $(CPPFLAGS)" \
+				CPPFLAGS="-I$(top_builddir)/rplcas/include $(CPPFLAGS)" \
 				LDFLAGS="-L$(top_builddir)/rplcas/lib $(LDFLAGS)" \
 				../$(srcdir)/@GIAC@/configure --prefix=$(top_builddir)/rplcas \
 				--enable-pari=$(top_builddir)/rplcas \
@@ -90,8 +91,10 @@ lib/libgiac.a: lib/libgmp.a lib/libmpfr.
 				\rm -f config.h.orig); \
 	fi
 	$(MAKE) -C @GIAC@ $(AM_MAKEFLAGS) -f Makefile2
-	for i in mkinstalldirs xcas.xpm xcas.desktop xcas.applications; \
-	do cp $(srcdir)/@GIAC@/$$i @GIAC@/$$i; done
+	if [ x$(srcdir) != x. ]; then \
+		for i in mkinstalldirs xcas.xpm xcas.desktop xcas.applications; \
+				do cp $(srcdir)/@GIAC@/$$i @GIAC@/$$i; done; \
+	fi
 	$(MAKE) -C @GIAC@ $(AM_MAKEFLAGS) install -f Makefile2
 
 lib/librplcas.a: lib/libgiac.a lib/libgmp.a lib/libmpfr.a
@@ -104,6 +107,15 @@ lib/librplcas.a: lib/libgiac.a lib/libgm
 		   	ar x ../lib/libmpfr.a && \
 		   	for i in `ar t ../lib/libmpfr.a`; \
 		   	do mv $$i libmpfr_$$i; done && \
+			ar x ../lib/libcocoa.a && \
+			for i in `ar t ../lib/libcocoa.a`; \
+			do mv $$i libcocoa_$$i; done && \
+			ar x ../lib/libpari.a && \
+			for i in `ar t ../lib/libpari.a`; \
+			do mv $$i libpari_$$i; done && \
+			ar x ../lib/ntl.a && \
+			for i in `ar t ../lib/ntl.a`; \
+			do mv $$i libntl_$$i; done && \
 		   	ar x ../lib/libgiac.a && \
 		   	for i in `ar t ../lib/libgiac.a`; \
 		   	do mv $$i libgiac_$$i; done && \