--- rpl/src/Makefile.am	2011/09/26 15:57:08	1.64
+++ rpl/src/Makefile.am	2011/10/03 15:57:53	1.65
@@ -39,26 +39,25 @@ date = -Dd_date_rpl="\"$(shell LC_ALL=fr
 		$(AWK) '{ v=$$0; gsub(/^[ \t]+/, "", v); gsub(/[ \t]+$$/, "", v); \
 		printf("%s\n", v);}')\""
 
-
-hash = -Drplpp_md5="\"$(shell $(top_builddir)/rplsums/rplmd5sum$(EXEEXT) \
+hash = -Drplpp_md5="\"$(shell @RPLTOOLS@/rplsums/rplmd5sum$(EXEEXT) \
 		$(top_builddir)/tools/@GPP@/src/gpp$(EXEEXT))\"" \
-		-Drplpp_sha1="\"$(shell $(top_builddir)/rplsums/rplsha1sum$(EXEEXT) \
+		-Drplpp_sha1="\"$(shell @RPLTOOLS@/rplsums/rplsha1sum$(EXEEXT) \
 		$(top_builddir)/tools/@GPP@/src/gpp$(EXEEXT))\"" \
-		-Drplfile_md5="\"$(shell $(top_builddir)/rplsums/rplmd5sum$(EXEEXT) \
+		-Drplfile_md5="\"$(shell @RPLTOOLS@/rplsums/rplmd5sum$(EXEEXT) \
 		$(top_builddir)/tools/@FILE@/src/rplfile$(EXEEXT))\"" \
-		-Drplfile_sha1="\"$(shell $(top_builddir)/rplsums/rplsha1sum$(EXEEXT) \
+		-Drplfile_sha1="\"$(shell @RPLTOOLS@/rplsums/rplsha1sum$(EXEEXT) \
 		$(top_builddir)/tools/@FILE@/src/rplfile$(EXEEXT))\"" \
-		-Drpliconv_md5="\"$(shell $(top_builddir)/rplsums/rplmd5sum$(EXEEXT) \
+		-Drpliconv_md5="\"$(shell @RPLTOOLS@/rplsums/rplmd5sum$(EXEEXT) \
 		$(top_builddir)/rpliconv/rpliconv$(EXEEXT))\"" \
-		-Drpliconv_sha1="\"$(shell $(top_builddir)/rplsums/rplsha1sum$(EXEEXT) \
+		-Drpliconv_sha1="\"$(shell @RPLTOOLS@/rplsums/rplsha1sum$(EXEEXT) \
 		$(top_builddir)/rpliconv/rpliconv$(EXEEXT))\"" \
-		-Drplawk_md5="\"$(shell $(top_builddir)/rplsums/rplmd5sum$(EXEEXT) \
+		-Drplawk_md5="\"$(shell @RPLTOOLS@/rplsums/rplmd5sum$(EXEEXT) \
 		$(top_builddir)/rplawk/rplawk$(EXEEXT))\"" \
-		-Drplawk_sha1="\"$(shell $(top_builddir)/rplsums/rplsha1sum$(EXEEXT) \
+		-Drplawk_sha1="\"$(shell @RPLTOOLS@/rplsums/rplsha1sum$(EXEEXT) \
 		$(top_builddir)/rplawk/rplawk$(EXEEXT))\"" \
-		-Drplconvert_md5="\"$(shell $(top_builddir)/rplsums/rplmd5sum$(EXEEXT) \
+		-Drplconvert_md5="\"$(shell @RPLTOOLS@/rplsums/rplmd5sum$(EXEEXT) \
 		$(top_builddir)/tools/@UNITS@/units$(EXEEXT))\"" \
-		-Drplconvert_sha1="\"$(shell $(top_builddir)/rplsums/rplsha1sum$(EXEEXT) \
+		-Drplconvert_sha1="\"$(shell @RPLTOOLS@/rplsums/rplsha1sum$(EXEEXT) \
 		$(top_builddir)/tools/@UNITS@/units$(EXEEXT))\""
 
 SRCC=\
@@ -267,44 +266,44 @@ INIT_LIBc=$(INIT_LIB:.c=-conv.c)
 INIT_EXEc=$(INIT_EXE:.c=-conv.c)
 
 %-conv.c: %.c
-	$(top_builddir)/rpliconv/rpliconv \
-			-f `$(top_builddir)/tools/@FILE@/src/rplfile \
-			-m $(top_builddir)/tools/@FILE@/magic/magic -i $< | \
+	@RPLTOOLS@/rpliconv/rpliconv \
+			-f `@RPLTOOLS@/tools/@FILE@/src/rplfile \
+			-m @RPLTOOLS@/tools/@FILE@/magic/magic -i $< | \
 			$(AWK) -F= '{print $$2;}'` \
 			-t @FINAL_ENCODING@//TRANSLIT $< | expand -t 4 > $@
 
 %-conv.cpp: %.cpp
-	$(top_builddir)/rpliconv/rpliconv \
-			-f `$(top_builddir)/tools/@FILE@/src/rplfile \
-			-m $(top_builddir)/tools/@FILE@/magic/magic -i $< | \
+	@RPLTOOLS@/rpliconv/rpliconv \
+			-f `@RPLTOOLS@/tools/@FILE@/src/rplfile \
+			-m @RPLTOOLS@/tools/@FILE@/magic/magic -i $< | \
 			$(AWK) -F= '{print $$2;}'` \
 			-t @FINAL_ENCODING@//TRANSLIT $< | expand -t 4 > $@
 
 %-conv.h: %.h
-	$(top_builddir)/rpliconv/rpliconv \
-			-f `$(top_builddir)/tools/@FILE@/src/rplfile \
-			-m $(top_builddir)/tools/@FILE@/magic/magic -i $< | \
+	@RPLTOOLS@/rpliconv/rpliconv \
+			-f `@RPLTOOLS@/tools/@FILE@/src/rplfile \
+			-m @RPLTOOLS@/tools/@FILE@/magic/magic -i $< | \
 			$(AWK) -F= '{print $$2;}'` \
 			-t @FINAL_ENCODING@//TRANSLIT $< | expand -t 4 > $@
 
 %-conv.f: %.f
-	$(top_builddir)/rpliconv/rpliconv \
-			-f `$(top_builddir)/tools/@FILE@/src/rplfile \
-			-m $(top_builddir)/tools/@FILE@/magic/magic -i $< | \
+	@RPLTOOLS@/rpliconv/rpliconv \
+			-f `@RPLTOOLS@/tools/@FILE@/src/rplfile \
+			-m @RPLTOOLS@/tools/@FILE@/magic/magic -i $< | \
 			$(AWK) -F= '{print $$2;}'` \
 			-t @FINAL_ENCODING@//TRANSLIT $< | expand -t 4 > $@
 
-
-	$(top_builddir)/rpliconv/rpliconv \
-			-f `$(top_builddir)/tools/@FILE@/src/rplfile \
-			-m $(top_builddir)/tools/@FILE@/magic/magic -i $< | \
+%-conv.F90: %.F90
+	@RPLTOOLS@/rpliconv/rpliconv \
+			-f `@RPLTOOLS@/tools/@FILE@/src/rplfile \
+			-m @RPLTOOLS@/tools/@FILE@/magic/magic -i $< | \
 			$(AWK) -F= '{print $$2;}'` \
 			-t @FINAL_ENCODING@//TRANSLIT $< | expand -t 4 > $@
 
 %-conv.inc: %.inc
-	$(top_builddir)/rpliconv/rpliconv \
-			-f `$(top_builddir)/tools/@FILE@/src/rplfile \
-			-m $(top_builddir)/tools/@FILE@/magic/magic -i $< | \
+	@RPLTOOLS@/rpliconv/rpliconv \
+			-f `@RPLTOOLS@/tools/@FILE@/src/rplfile \
+			-m @RPLTOOLS@/tools/@FILE@/magic/magic -i $< | \
 			$(AWK) -F= '{print $$2;}'` \
 			-t @FINAL_ENCODING@//TRANSLIT $< | expand -t 4 > $@