--- rpl/src/Makefile.am	2010/03/18 21:42:41	1.11
+++ rpl/src/Makefile.am	2010/03/29 07:57:43	1.13
@@ -383,7 +383,7 @@ CLEANFILES= $(SRCCc) $(SRCHc) $(SRCFc) $
 nodist_rpl_SOURCES = $(SRCCc) $(SRCHc) $(SRCFc) $(SRCF90c) $(INIT_EXEc) \
 		$(SRCXPM) $(SRCINCc)
 #rpl_LDFLAGS = -g @PROFILAGE@ $(LIB) -rdynamic
-rpl_LDFLAGS = -g @PROFILAGE@ $(LIB) --export-dynamic
+rpl_LDFLAGS = -g @PROFILAGE@ $(LIB) -Wl,--export-dynamic
 
 rpl_CFLAGS = $(AM_CFLAGS) -Wall -Wextra \
 			 -Wno-pointer-sign -Wno-unused-parameter
@@ -408,7 +408,7 @@ DEFS = -DHAVE_CONFIG_H -Dd_version_rpl=\
 		@MOTIF_SUPPORT@ @POSTSCRIPT_SUPPORT@ @GNUPLOT_SUPPORT@ \
 		@VIM_SUPPORT@ @MYSQL_SUPPORT@ @POSTGRESQL_SUPPORT@ \
 		@EXPERIMENTAL_CODE@ $(date) $(hash) -g @PROFILAGE@ \
-		-Dd_locale=\"$(shell locale charmap)\" \
+		-Dd_locale=\"@FINAL_ENCODING@\" \
 		-D@OS@
 rpl_LDADD = $(top_builddir)/lapack/lapack/liblapack.a \
 		$(top_builddir)/lapack/blas/libblas.a \