--- rpl/src/Makefile.am	2010/01/29 11:38:15	1.2
+++ 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\
@@ -328,17 +332,17 @@ CLEANFILES= $(SRCCc) $(SRCHc) $(SRCFc) $
 
 nodist_rpl_SOURCES = $(SRCCc) $(SRCHc) $(SRCFc) $(SRCF90c) $(INIT_EXEc) \
 		$(SRCXPM) $(SRCINCc)
-#rpl_LDFLAGS = -g @DEBUG@ @PROFILAGE@ $(LIB) -rdynamic
-rpl_LDFLAGS = -g @DEBUG@ @PROFILAGE@ $(LIB) -export-dynamic
+#rpl_LDFLAGS = -g @PROFILAGE@ $(LIB) -rdynamic
+rpl_LDFLAGS = -g @PROFILAGE@ $(LIB) -export-dynamic
 
-rpl_CFLAGS = $(AM_CFLAGS) -D_REENTRANT -Wall -Wextra \
+rpl_CFLAGS = $(AM_CFLAGS) -Wall -Wextra \
 			 -Wno-pointer-sign -Wno-unused-parameter
 rpl_FFLAGS = $(AM_FFLAGS) -fno-f2c
 rpl_FCFLAGS = $(AM_FCFLAGS) -fno-second-underscore -fno-f2c
 
 nodist_librpl_a_SOURCES = $(SRCCc) $(SRCHc) $(SRCFc) $(SRCF90c) $(INIT_LIBc) \
 		 $(SRCXPM) $(SRCINCc)
-librpl_a_CFLAGS = $(AM_CFLAGS) -DLIBRPL -D_REENTRANT \
+librpl_a_CFLAGS = $(AM_CFLAGS) -DLIBRPL \
 		-Wall -Wextra -Wno-pointer-sign -Wno-unused-parameter
 librpl_a_FFLAGS = $(AM_FFLAGS) -ff2c
 librpl_a_FCFLAGS = $(AM_FCLAGS) -fno-second-underscore
@@ -350,12 +354,12 @@ INCLUDES = -I$(srcdir) -I$(top_builddir)
 		$(include_libiconv) \
 		@includeX@ @libMySQLinc@ @libPgSQLinc@
 DEFS = -DHAVE_CONFIG_H -Dd_version_rpl=\"@VERSION@\" \
-		-Dd_exec_path=\"@RUNPATH@\" @FORCE_GNUPLOT_PATH@ @DEBUG_CODE@ \
+		-Dd_exec_path=\"@RUNPATH@\" @FORCE_GNUPLOT_PATH@ @DEBUG@ \
 		@MOTIF_SUPPORT@ @POSTSCRIPT_SUPPORT@ @GNUPLOT_SUPPORT@ \
 		@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) \