Makefile uses convert.awk now - read comments for full info

diff --git a/lang/Makefile b/lang/Makefile
index 3e88852563eee4e0ef880884e3d08556bea44b9a..c7482f26ab3e4372f446e9503336615c833a9bdb 100644 (file)
--- a/lang/Makefile
+++ b/lang/Makefile
@@ -2,8 +2,12 @@
 # You should add your encodings to this file.  You need to have GNU Recode
 # installed.
 # 
-# It is important to fix the first and last lines of the file <?php and ?>
-# using 'awk'
+# It is important to:
+# - fix the delimiters of php code: <?php and ?>
+# - convert CRLF -> LF
+# - remove all text before first <?php
+# - remove all text after last ?>
+# using 'convert.awk'
 #
 # Modifications by Dave Smith, 2003-11-10:
 #      Added TARGETS variable for easy listing of all lang files.
@@ -13,8 +17,10 @@
 #      Added dependency checking for incremental recoding.
 #      Added pretty "Recoding ..." messages.
 #      Added 'chmod 644' to 'all' target for correct file permissions.
+# Modifications by Rafal Slubowski, 2003-12-12:
+#       All conversions of recoded text moved to convert.awk script
 # 
-# $Id: Makefile,v 1.32 2003/11/24 01:10:00 chriskl Exp $
+# $Id: Makefile,v 1.33 2003/12/11 23:38:32 slubek Exp $
 
 DESTDIR=./recoded
 TARGETS=polish \
@@ -41,7 +47,7 @@ all:  prepare ${TARGETS}
 
 prepare:
        @which recode >/dev/null 2>&1 || ( echo "You must have GNU 'recode' installed to use this Makefile,\
-                                                                               but I could not find it in your path!" && exit 1 )
+                                               but I could not find it in your path!" && exit 1 )
 
 clean:
        @echo "Nuking recoded lang files..."
@@ -49,127 +55,109 @@ clean:
 
 polish:        polish.php
        @echo "Recoding polish..."
-       @cat polish.php | recode latin2..html | \
-               awk '{ gsub("&gt;",">"); gsub("&lt;","<"); print $0}' \
+       @cat polish.php | recode latin2..html | ./convert.awk \
                > ${DESTDIR}/polish.php
        @chmod 644 polish.php ${DESTDIR}/polish.php
 
 english:       english.php
        @echo "Recoding english..."
-       @cat english.php | recode latin1..html | \
-               awk '{ gsub("&gt;",">"); gsub("&lt;","<"); print $0}' \
+       @cat english.php | recode latin1..html | ./convert.awk \
                > ${DESTDIR}/english.php
        @chmod 644 english.php ${DESTDIR}/english.php
 
 dutch: dutch.php
        @echo "Recoding dutch..."
-       @cat dutch.php | recode latin1..html | \
-               awk '{ gsub("&gt;",">"); gsub("&lt;","<"); print $0}' \
+       @cat dutch.php | recode latin1..html | ./convert.awk \
                > ${DESTDIR}/dutch.php
        @chmod 644 dutch.php ${DESTDIR}/dutch.php
 
 german:        german.php
        @echo "Recoding german..."
-       @cat german.php | recode utf-8..html | \
-               awk '{ gsub("&gt;",">"); gsub("&lt;","<"); print $0}' \
+       @cat german.php | recode utf-8..html | ./convert.awk \
                > ${DESTDIR}/german.php
        @chmod 644 german.php ${DESTDIR}/german.php
 
 spanish:       spanish.php
        @echo "Recoding spanish..."
-       @cat spanish.php | recode iso-8859-1..html | \
-               awk '{ gsub("&gt;",">"); gsub("&lt;","<"); print $0}' \
+       @cat spanish.php | recode iso-8859-1..html | ./convert.awk \
                > ${DESTDIR}/spanish.php
        @chmod 644 spanish.php ${DESTDIR}/spanish.php
 
 italian:       italian.php
        @echo "Recoding italian..."
-       @cat italian.php | recode iso-8859-1..html | \
-               awk '{ gsub("&gt;",">"); gsub("&lt;","<"); print $0}' \
+       @cat italian.php | recode iso-8859-1..html | ./convert.awk \
                > ${DESTDIR}/italian.php
        @chmod 644 italian.php ${DESTDIR}/italian.php
 
 chinese-tr:    chinese-tr.php
        @echo "Recoding chinese-tr..."
-       @cat chinese-tr.php | recode big5..html | \
-               awk '{ gsub("&gt;",">"); gsub("&lt;","<"); print $0}' \
+       @cat chinese-tr.php | recode big5..html | ./convert.awk \
                > ${DESTDIR}/chinese-tr.php
        @chmod 644 chinese-tr.php ${DESTDIR}/chinese-tr.php
 
 chinese-sim:   chinese-sim.php
        @echo "Recoding chinese-sim..."
-       @cat chinese-sim.php | recode gb2312..html | \
-               awk '{ gsub("&gt;",">"); gsub("&lt;","<"); print $0}' \
+       @cat chinese-sim.php | recode gb2312..html | ./convert.awk \
                > ${DESTDIR}/chinese-sim.php
        @chmod 644 chinese-sim.php ${DESTDIR}/chinese-sim.php
 
 french:        french.php
        @echo "Recoding french..."
-       @cat french.php | recode latin1..html | \
-               awk '{ gsub("&gt;",">"); gsub("&lt;","<"); print $0}' \
+       @cat french.php | recode latin1..html | ./convert.awk \
                > ${DESTDIR}/french.php
        @chmod 644 french.php ${DESTDIR}/french.php
 
 japanese:      japanese.php
        @echo "Recoding japanese..."
-       @cat japanese.php | recode euc-jp..html | \
-               awk '{ gsub("&gt;",">"); gsub("&lt;","<"); print $0}' \
+       @cat japanese.php | recode euc-jp..html | ./convert.awk \
                > ${DESTDIR}/japanese.php
        @chmod 644 japanese.php ${DESTDIR}/japanese.php
 
 russian:       russian.php
        @echo "Recoding russian..."
-       @cat russian.php | recode koi8..html | \
-               awk '{ gsub("&gt;",">"); gsub("&lt;","<"); print $0}' \
+       @cat russian.php | recode koi8..html | ./convert.awk \
                > ${DESTDIR}/russian.php
        @chmod 644 russian.php ${DESTDIR}/russian.php
 
 slovak:        slovak.php
        @echo "Recoding slovak..."
-       @cat slovak.php | recode utf-8..html | \
-               awk '{ gsub("&gt;",">"); gsub("&lt;","<"); print $0}' \
+       @cat slovak.php | recode utf-8..html | ./convert.awk \
                > ${DESTDIR}/slovak.php
        @chmod 644 slovak.php ${DESTDIR}/slovak.php
 
 czech: czech.php
        @echo "Recoding czech..."
-       @cat czech.php | recode cp1250..html | \
-               awk '{ gsub("&gt;",">"); gsub("&lt;","<"); print $0}' \
+       @cat czech.php | recode cp1250..html | ./convert.awk \
                > ${DESTDIR}/czech.php
        @chmod 644 czech.php ${DESTDIR}/czech.php
 
 turkish:       turkish.php
        @echo "Recoding turkish..."
-       @cat turkish.php | recode iso-8859-9..html | \
-               awk '{ gsub("&gt;",">"); gsub("&lt;","<"); print $0}' \
+       @cat turkish.php | recode iso-8859-9..html | ./convert.awk \
                > ${DESTDIR}/turkish.php
        @chmod 644 turkish.php ${DESTDIR}/turkish.php
 
 portuguese-br: portuguese-br.php
        @echo "Recoding portuguese-br..."
-       @cat portuguese-br.php | recode iso-8859-1..html | \
-               awk '{ gsub("&gt;",">"); gsub("&lt;","<"); print $0}' \
+       @cat portuguese-br.php | recode iso-8859-1..html | ./convert.awk \
                > ${DESTDIR}/portuguese-br.php
        @chmod 644 portuguese-br.php ${DESTDIR}/portuguese-br.php
 
 swedish:       swedish.php
        @echo "Recoding swedish..."
-       @cat swedish.php | recode iso-8859-1..html | \
-               awk '{ gsub("&gt;",">"); gsub("&lt;","<"); print $0}' \
+       @cat swedish.php | recode iso-8859-1..html | ./convert.awk \
                > ${DESTDIR}/swedish.php
        @chmod 644 swedish.php ${DESTDIR}/swedish.php
 
 afrikaans:     afrikaans.php
        @echo "Recoding afrikaans..."
-       @cat afrikaans.php | recode iso-8859-1..html | \
-               awk '{ gsub("&gt;",">"); gsub("&lt;","<"); print $0}' \
+       @cat afrikaans.php | recode iso-8859-1..html | ./convert.awk \
                > ${DESTDIR}/afrikaans.php
        @chmod 644 afrikaans.php ${DESTDIR}/afrikaans.php
 
 hungarian:     hungarian.php
        @echo "Recoding hungarian..."
-       @cat hungarian.php | recode utf-8..html | \
-               awk '{ gsub("&gt;",">"); gsub("&lt;","<"); print $0}' \
+       @cat hungarian.php | recode utf-8..html | ./convert.awk \
                > ${DESTDIR}/hungarian.php
        @chmod 644 hungarian.php ${DESTDIR}/hungarian.php