From c158ff37a0eb70a29740d5b0e6b079139675c539 Mon Sep 17 00:00:00 2001
From: lpenet <lpenet@fsfe.org>
Date: Mon, 7 May 2001 07:09:06 +0000
Subject: [PATCH] 
 ----------------------------------------------------------------------      
 Corrected a dummy mistake: I had replace Makefile for 	sabcmd with Makefile
 for xsltprox

 Modified Files:
 	Makefile
----------------------------------------------------------------------

svn path=/trunk/; revision=363
---
 Makefile | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index 09852688c2..6f29502082 100644
--- a/Makefile
+++ b/Makefile
@@ -9,17 +9,23 @@
 # libxslt + libxml2 (xsltproc)
 # http://www.xmlsoft.org/
 #
-XSLTPROC = xsltproc
+# XML validator
+# -------------
+# apt-get install rxp
+# or
+# ftp://ftp.cogsci.ed.ac.uk/pub/richard/rxp-1.2.3.tar.gz
+#
+XSLTPROC = sabcmd
 
 FSFFRANCE = http://france.fsfeurope.org
-FSFEUROPE = . # http://www.fsfeurope.org
+FSFEUROPE = http://www.fsfeurope.org
 FSF       = http://www.fsf.org
 GNU       = http://www.gnu.org
 
 XSLTOPTS = \
-	--param fsffrance $(FSFFRANCE) \
-	--param fsf $(FSF) \
-	--param gnu $(GNU)
+	'$$fsffrance=$(FSFFRANCE)' \
+	'$$fsf=$(FSF)' \
+	'$$gnu=$(GNU)'
 
 ENPAGES = $(shell find * -path 'fr' -prune -o -regex '[^\.]*\.xhtml' -print | sed "s/xhtml$$/html/")
 
@@ -36,7 +42,7 @@ $(ENPAGES): %.html: %.xhtml fsfe.xsl navigation.en.xsl
 	filebase=`basename $$base` ; \
 	dir=`dirname $$path` ; \
 	root=`dirname $$path | perl -pe 'chop; s:([^/]+):..:g if($$_ ne ".")'` ; \
-	$(XSLTPROC) $(XSLTOPTS) '--param fsfeurope '$$root '--param filebase '$$filebase fsfe.xsl $$path > $$base.html-temp && (cat $$base.html-temp | perl -p -e '$$| = 1; s/\$$//g if(/\$$''Date:/); s/mode: xml \*\*\*/mode: html \*\*\*/' > $$base.html) ; \
+	$(XSLTPROC) fsfe.xsl $$path $(XSLTOPTS) '$$fsfeurope='$$root '$$filebase='$$filebase > $$base.html-temp && (cat $$base.html-temp | perl -p -e '$$| = 1; s/\$$//g if(/\$$''Date:/); s/mode: xml \*\*\*/mode: html \*\*\*/' > $$base.html) ; \
 	rm -f $$base.html-temp
 
 $(FRPAGES): %.html: %.xhtml fsfe.xsl navigation.fr.xsl
@@ -46,7 +52,7 @@ $(FRPAGES): %.html: %.xhtml fsfe.xsl navigation.fr.xsl
 	filebase=`basename $$base` ; \
 	dir=`dirname $$path` ; \
 	root=`dirname $$path | perl -pe 'chop; s:([^/]+):..:g if($$_ ne ".")'` ; \
-	$(XSLTPROC) $(XSLTOPTS) '--param fsfeurope '$$root '--param filebase '$$filebase fsfe.xsl $$path > $$base.html-temp && (cat $$base.html-temp | perl -p -e '$$| = 1; s/\$$//g if(/\$$''Date:/); s/mode: xml \*\*\*/mode: html \*\*\*/' > $$base.html) ; \
+	$(XSLTPROC) fsfe.xsl $$path $(XSLTOPTS) '$$fsfeurope='$$root '$$filebase='$$filebase > $$base.html-temp && (cat $$base.html-temp | perl -p -e '$$| = 1; s/\$$//g if(/\$$''Date:/); s/mode: xml \*\*\*/mode: html \*\*\*/' > $$base.html) ; \
 	rm -f $$base.html-temp
 
 $(DEPAGES): %.html: %.xhtml fsfe.xsl navigation.de.xsl
@@ -56,7 +62,7 @@ $(DEPAGES): %.html: %.xhtml fsfe.xsl navigation.de.xsl
 	filebase=`basename $$base` ; \
 	dir=`dirname $$path` ; \
 	root=`dirname $$path | perl -pe 'chop; s:([^/]+):..:g if($$_ ne ".")'` ; \
-	$(XSLTPROC) $(XSLTOPTS) '--param fsfeurope='$$root '--param filebase='$$filebase fsfe.xsl $$path > $$base.html-temp && (cat $$base.html-temp | perl -p -e '$$| = 1; s/\$$//g if(/\$$''Date:/); s/mode: xml \*\*\*/mode: html \*\*\*/' > $$base.html) ; \
+	$(XSLTPROC) fsfe.xsl $$path $(XSLTOPTS) '$$fsfeurope='$$root '$$filebase='$$filebase '$$path='$$path > $$base.html-temp && (cat $$base.html-temp | perl -p -e '$$| = 1; s/\$$//g if(/\$$''Date:/); s/mode: xml \*\*\*/mode: html \*\*\*/' > $$base.html) ; \
 	rm -f $$base.html-temp
 
 # remove html files for which an xhtml version exists (exclude fr/)