--- rpl/Makefile.am	2010/08/09 13:52:11	1.16
+++ rpl/Makefile.am	2010/08/13 21:02:18	1.17
@@ -17,7 +17,7 @@ toolsdistclean:
 	for i in @NCURSES@ @READLINE@ @UNITS@ @GSL@ @GPP@ @GNUPLOT_COMPILATION@ \
 			@FILE@ @ICONV@ @SQLITE@; \
 	do \
-		\rm -rf $(srcdir)/tools/$$i; \
+		rm -rf $(srcdir)/tools/$$i; \
 	done;
 
 toolsclean:
@@ -52,11 +52,11 @@ $(top_builddir)/tools/@NCURSES@/lib/libn
 					print; \
 				} \
 			}' $$i > $$TMP; \
-			\mv -f $$TMP $$i; \
+			mv -f $$TMP $$i; \
 			echo -n " (fixed)"; \
 		else \
 			echo -n " (nothing to do)"; \
-			\rm -f $$TMP; \
+			rm -f $$TMP; \
 		fi; \
 		echo .; \
 	done;
@@ -70,7 +70,7 @@ $(top_builddir)/tools/@NCURSES@/lib/libn
 #				printf("../lib/libpanel.a ../lib/libncurses.a\n"); } \
 #			! /^TEST_ARGS/ \
 #				{ print; }' tools/@NCURSES@/test/Makefile > $$TMP; \
-#		\mv -f $$TMP $$i; \
+#		mv -f $$TMP $$i; \
 #		echo .; \
 #	done;
 	if [ @OS@ = "OS2" ]; then \
@@ -91,11 +91,11 @@ $(top_builddir)/tools/@NCURSES@/lib/libn
 				{ printf("CXX = g++\n"); } \
 			! /^CXX[ \t]/ \
 				{ print; }' > $$TMP; \
-		\mv -f $$TMP $(top_builddir)/tools/@NCURSES@/c++/Makefile; \
+		mv -f $$TMP $(top_builddir)/tools/@NCURSES@/c++/Makefile; \
 	fi;
 	$(MAKE) -C $(top_builddir)/tools/@NCURSES@ $(AM_MAKEFLAGS)
 	if [ @OS@ = "OS2" ]; then \
-		\cp -f $(top_builddir)/tools/@NCURSES@/lib/ncurses.a \
+		cp -f $(top_builddir)/tools/@NCURSES@/lib/ncurses.a \
 				$(top_builddir)/tools/@NCURSES@/lib/libncurses.a; \
 	fi
 
@@ -104,12 +104,14 @@ $(top_builddir)/tools/@READLINE@/libread
 	$(MAKE) -C $(top_builddir)/tools/@READLINE@ $(AM_MAKEFLAGS)
 
 $(top_builddir)/tools/@GSL@/.libs/libgsl.a:
-	if [ @OS@ == "OS2" ]; then \
-		(cp $(top_builddir)/tools/@GSL@ && ./configure --disable-shared); \
+# Quick and dirty hack pour avaliser le remplacement de ${1 + "$@"}
+# dans ltmain.sh et propager les modifications dans le script libtool.
+	if [ @OS@ = "OS2" ]; then \
+		(cd $(top_builddir)/tools/@GSL@ && configure --disable-shared;); \
 	fi
 	$(MAKE) -C $(top_builddir)/tools/@GSL@ $(AM_MAKEFLAGS)
-	if [ @OS@ == "OS2" ]; then \
-		\cp $(top_builddir)/tools/@GSL@/.libs/gsl.a \
+	if [ @OS@ = "OS2" ]; then \
+		cp $(top_builddir)/tools/@GSL@/.libs/gsl.a \
 				$(top_builddir)/tools/@GSL@/.libs/libgsl.a; \
 	fi
 
@@ -119,9 +121,9 @@ $(top_builddir)/tools/@ICONV@/lib/.libs/
 		TMP=$$(mktemp tmp.XXXXXXXXXX); \
 		awk '! /^[ \t]cd po/ { print; }' \
 				$(top_builddir)/tools/@ICONV@/Makefile > $$TMP; \
-		\mv -f $$TMP $(top_builddir)/tools/@ICONV@/Makefile; \
+		mv -f $$TMP $(top_builddir)/tools/@ICONV@/Makefile; \
 		$(MAKE) -C $(top_builddir)/tools/@ICONV@ $(AM_MAKEFLAGS) all; \
-		\cp -f $(top_builddir)/tools/@ICONV@/lib/.libs/iconv.a \
+		cp -f $(top_builddir)/tools/@ICONV@/lib/.libs/iconv.a \
 				$(top_builddir)/tools/@ICONV@/lib/.libs/libiconv.a; \
 	else \
 		$(MAKE) -C $(top_builddir)/tools/@ICONV@ $(AM_MAKEFLAGS) all; \
@@ -159,7 +161,7 @@ $(top_builddir)/tools/@FILE@/src/rplfile
 			print; \
 		} \
 	}' tools/@FILE@/src/Makefile > $$TMP; \
-	\mv -f $$TMP tools/@FILE@/src/Makefile
+	mv -f $$TMP tools/@FILE@/src/Makefile
 	$(MAKE) -C $(top_builddir)/tools/@FILE@ $(AM_MAKEFLAGS)
 
 $(top_builddir)/tools/@SQLITE@/.libs/libsqlite3.a:
@@ -181,9 +183,9 @@ $(top_builddir)/tools/@OPENSSL@/libcrypt
 				sed -e '1,$$s/-DOPENSSL_BN_ASM_PART_WORDS/-UOPENSSL_BN_ASM_PART_ASM/g' \
 				> OS2-EMX.mak2; \
 				$(MAKE) -j1 -f OS2-EMX.mak2 $(AM_MAKEFLAGS)); \
-				\cp $(top_builddir)/tools/@OPENSSL@/out/ssl.a \
+				cp $(top_builddir)/tools/@OPENSSL@/out/ssl.a \
 						$(top_builddir)/tools/@OPENSSL@/libssl.a; \
-				\cp $(top_builddir)/tools/@OPENSSL@/out/crypto.a \
+				cp $(top_builddir)/tools/@OPENSSL@/out/crypto.a \
 						$(top_builddir)/tools/@OPENSSL@/libcrypto.a; \
 	else \
 		(cd $(top_builddir)/tools/@OPENSSL@ && $(MAKE) -j1 $(AM_MAKEFLAGS)); \