--- rpl/src/Attic/Makefile.in	2010/03/01 14:48:14	1.5
+++ rpl/src/Attic/Makefile.in	2010/03/04 10:09:31	1.6
@@ -435,7 +435,7 @@ DEFS = -DHAVE_CONFIG_H -Dd_version_rpl=\
 		@VIM_SUPPORT@ @MYSQL_SUPPORT@ @POSTGRESQL_SUPPORT@ \
 		@EXPERIMENTAL_CODE@ $(date) -g @PROFILAGE@ \
 		-Dd_locale=\"$(shell locale charmap)\" \
-		-D$(shell uname)
+		-D@OS@
 
 DEPDIR = @DEPDIR@
 DVIPS = @DVIPS@
@@ -469,6 +469,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LATEX = @LATEX@
 LDFLAGS = @LDFLAGS@
+LIBICONV = @LIBICONV@
 LIBMTMALLOC = @LIBMTMALLOC@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -481,6 +482,7 @@ MOTIF_SUPPORT = @MOTIF_SUPPORT@
 MYSQL_SUPPORT = @MYSQL_SUPPORT@
 NCURSES = @NCURSES@
 OBJEXT = @OBJEXT@
+OS = @OS@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -584,10 +586,14 @@ include_libreadline = -I$(top_srcdir)/to
 
 ldadd_libgsl = $(top_builddir)/tools/@GSL@/.libs/libgsl.a
 include_libgsl = -I$(top_builddir)/tools/@GSL@
-ldadd_libiconv = $(top_builddir)/tools/@ICONV@/lib/.libs/libiconv.a
+ldadd_libiconv = $(top_builddir)/tools/@ICONV@/lib/.libs/@LIBICONV@
 include_libiconv = -I$(top_builddir)/tools/@ICONV@/include
-date := -Dd_date_rpl="\"$(shell LC_ALL=fr_FR date +'%A %x, %X %Z')\"" \
-		-Dd_date_en_rpl="\"$(shell LC_ALL=C date +'%A %x, %X %Z')\""
+date := -Dd_date_rpl="\"$(shell LC_ALL=fr_FR date +'%A %x, %X %Z' | \
+		awk '{ v=$$0; gsub(/^[ \t]+/, "", v); gsub(/[ \t]+$$/, "", v); \
+		printf("%s\n", v);}')\"" \
+		-Dd_date_en_rpl="\"$(shell LC_ALL=C date +'%A %x, %X %Z' | \
+		awk '{ v=$$0; gsub(/^[ \t]+/, "", v); gsub(/[ \t]+$$/, "", v); \
+		printf("%s\n", v);}')\""
 
 SRCC = \
 	algebre_lineaire1.c\