--- rpl/src/Makefile.am	2010/03/01 14:48:14	1.4
+++ rpl/src/Makefile.am	2010/03/04 10:09:31	1.5
@@ -10,11 +10,15 @@ 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\
@@ -355,7 +359,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@
 rpl_LDADD = $(top_builddir)/lapack/lapack/liblapack.a \
 		$(top_builddir)/lapack/blas/libblas.a \
 		$(ldadd_libhistory) $(ldadd_libreadline) $(ldadd_libncurses) \