Some more copied and not synced Makefiles fixed.

CVS version numbers

arabic/Pics/Makefile: 1.1 -> 1.2 
chinese/CD/faq/Makefile: 1.1 -> 1.2 
czech/Pics/Makefile: 1.1 -> 1.2 
japanese/ports/freebsd/Makefile: 1.1 -> 1.2 
russian/News/2003/Makefile: 1.1 -> 1.2 
russian/security/2002/Makefile: 1.1 -> 1.2 
russian/security/2003/Makefile: 1.1 -> 1.2 
turkish/CD/Makefile: 1.1 -> 1.2 
turkish/CD/http-ftp/Makefile: 1.1 -> 1.2 
turkish/News/2002/Makefile: 1.1 -> 1.2 
turkish/News/2003/Makefile: 1.1 -> 1.2 
turkish/consultants/Makefile: 1.1 -> 1.2

12 files changed, 12 insertions, 288 deletions

diff --git a/arabic/Pics/Makefile b/arabic/Pics/Makefile
index 00128586bb7..e7a55ed3b42 100644
--- a/arabic/Pics/Makefile
+++ b/arabic/Pics/Makefile
@@ -1,56 +1 @@
-# This Makefile should need no changes from webwml/english/Pics/Makefile
-# Please send a message to debian-www if you need to modify anything
-# so the problem can be fixed.
-
-# random hint: for i in ../../english/Pics/*.png ../../english/Pics/debian.jpg ../../english/Pics/logo-50.jpg; do ln -s $i . ; done
-
-WMLBASE=..
-CUR_DIR=Pics
-SUBS=
-
-include $(WMLBASE)/Make.lang
-
-include pics.conf
-
-debbar := $(ENGLISHDIR)/Pics/debbar.pl
-ifneq "$(wildcard debbar.pl)" ""
-debbar := ./debbar.pl
-endif
-
-ifneq "$(ANTIALIAS)" ""
-debbar += -antialias $(ANTIALIAS)
-endif
-ifneq "$(FONTFACE)" ""
-debbar += -fontface $(FONTFACE)
-endif
-ifneq "$(FONTSIZE)" ""
-debbar += -fontsize $(FONTSIZE)
-endif
-ifneq "$(FONTTYPE)" ""
-debbar += -fonttype $(FONTTYPE)
-endif
-ifneq "$(FONTREGISTRY)" ""
-debbar += -fontregistry $(FONTREGISTRY)
-endif
-ifneq "$(FONTENCODING)" ""
-debbar += -fontencoding $(FONTENCODING)
-endif
-
-about.$(LANGUAGE).gif:
-	$(debbar) -words $(ABOUT_TEXT) -o $(CURDIR)/$@
-devel.$(LANGUAGE).gif:
-	$(debbar) -words $(DEVEL_TEXT) -o $(CURDIR)/$@
-getting.$(LANGUAGE).gif:
-	$(debbar) -words $(GETTING_TEXT) -o $(CURDIR)/$@
-news.$(LANGUAGE).gif:
-	$(debbar) -words $(NEWS_TEXT) -o $(CURDIR)/$@
-search.$(LANGUAGE).gif:
-	$(debbar) -words $(SEARCH_TEXT) -o $(CURDIR)/$@
-sitemap.$(LANGUAGE).gif:
-	$(debbar) -words $(SITEMAP_TEXT) -o $(CURDIR)/$@
-support.$(LANGUAGE).gif:
-	$(debbar) -words $(SUPPORT_TEXT) -o $(CURDIR)/$@
-
-pics: about.$(LANGUAGE).gif devel.$(LANGUAGE).gif getting.$(LANGUAGE).gif \
-  news.$(LANGUAGE).gif search.$(LANGUAGE).gif sitemap.$(LANGUAGE).gif \
-  support.$(LANGUAGE).gif
+include $(subst webwml/arabic,webwml/english,$(CURDIR))/Makefile
diff --git a/chinese/CD/faq/Makefile b/chinese/CD/faq/Makefile
index a88f47c51c9..17f19c095e2 100644
--- a/chinese/CD/faq/Makefile
+++ b/chinese/CD/faq/Makefile
@@ -1,11 +1 @@
-# This Makefile should need no changes from webwml/english/CD/faq/Makefile
-# Please send a message to debian-www if you need to modify anything
-# so the problem can be fixed.
-
-WMLBASE=../..
-CUR_DIR=CD/faq
-SUBS=
-
-include $(WMLBASE)/Make.lang
-
-index.$(LANGUAGE).html: index.wml $(TEMPLDIR)/cdimage.wml $(TEMPLDIR)/toc.wml
+include $(subst webwml/chinese,webwml/english,$(CURDIR))/Makefile
diff --git a/czech/Pics/Makefile b/czech/Pics/Makefile
index 00128586bb7..f35f700e8d0 100644
--- a/czech/Pics/Makefile
+++ b/czech/Pics/Makefile
@@ -1,56 +1 @@
-# This Makefile should need no changes from webwml/english/Pics/Makefile
-# Please send a message to debian-www if you need to modify anything
-# so the problem can be fixed.
-
-# random hint: for i in ../../english/Pics/*.png ../../english/Pics/debian.jpg ../../english/Pics/logo-50.jpg; do ln -s $i . ; done
-
-WMLBASE=..
-CUR_DIR=Pics
-SUBS=
-
-include $(WMLBASE)/Make.lang
-
-include pics.conf
-
-debbar := $(ENGLISHDIR)/Pics/debbar.pl
-ifneq "$(wildcard debbar.pl)" ""
-debbar := ./debbar.pl
-endif
-
-ifneq "$(ANTIALIAS)" ""
-debbar += -antialias $(ANTIALIAS)
-endif
-ifneq "$(FONTFACE)" ""
-debbar += -fontface $(FONTFACE)
-endif
-ifneq "$(FONTSIZE)" ""
-debbar += -fontsize $(FONTSIZE)
-endif
-ifneq "$(FONTTYPE)" ""
-debbar += -fonttype $(FONTTYPE)
-endif
-ifneq "$(FONTREGISTRY)" ""
-debbar += -fontregistry $(FONTREGISTRY)
-endif
-ifneq "$(FONTENCODING)" ""
-debbar += -fontencoding $(FONTENCODING)
-endif
-
-about.$(LANGUAGE).gif:
-	$(debbar) -words $(ABOUT_TEXT) -o $(CURDIR)/$@
-devel.$(LANGUAGE).gif:
-	$(debbar) -words $(DEVEL_TEXT) -o $(CURDIR)/$@
-getting.$(LANGUAGE).gif:
-	$(debbar) -words $(GETTING_TEXT) -o $(CURDIR)/$@
-news.$(LANGUAGE).gif:
-	$(debbar) -words $(NEWS_TEXT) -o $(CURDIR)/$@
-search.$(LANGUAGE).gif:
-	$(debbar) -words $(SEARCH_TEXT) -o $(CURDIR)/$@
-sitemap.$(LANGUAGE).gif:
-	$(debbar) -words $(SITEMAP_TEXT) -o $(CURDIR)/$@
-support.$(LANGUAGE).gif:
-	$(debbar) -words $(SUPPORT_TEXT) -o $(CURDIR)/$@
-
-pics: about.$(LANGUAGE).gif devel.$(LANGUAGE).gif getting.$(LANGUAGE).gif \
-  news.$(LANGUAGE).gif search.$(LANGUAGE).gif sitemap.$(LANGUAGE).gif \
-  support.$(LANGUAGE).gif
+include $(subst webwml/czech,webwml/english,$(CURDIR))/Makefile
diff --git a/japanese/ports/freebsd/Makefile b/japanese/ports/freebsd/Makefile
index 9733ff091e0..3b7e77d22dc 100644
--- a/japanese/ports/freebsd/Makefile
+++ b/japanese/ports/freebsd/Makefile
@@ -1,10 +1 @@
-# This Makefile should need no changes from webwml/english/ports/freebsd/Makefile
-# Please send a message to debian-www if you need to modify anything
-# so the problem can be fixed.
-
-WMLBASE=../..
-CUR_DIR=ports/freebsd
-SUBS=
-
-include $(WMLBASE)/Make.lang
-
+include $(subst webwml/japanese,webwml/english,$(CURDIR))/Makefile
diff --git a/russian/News/2003/Makefile b/russian/News/2003/Makefile
index 7032352f012..10484184c17 100644
--- a/russian/News/2003/Makefile
+++ b/russian/News/2003/Makefile
@@ -1,15 +1 @@
-# This Makefile should need no changes from webwml/english/News/2003/Makefile
-# Please send a message to debian-www if you need to modify anything
-# so the problem can be fixed.
-
-WMLBASE=../..
-CUR_DIR=News/2003
-SUBS=
-
-include $(WMLBASE)/Make.lang
-
-%.$(LANGUAGE).html: %.wml $(TEMPLDIR)/news.wml $(GETTEXTDEP)
-	$(WML) $(<F)
-index.$(LANGUAGE).html: index.wml $(TEMPLDIR)/template.wml \
-  $(TEMPLDIR)/recent_list.wml $(wildcard 2003*.wml) \
-  $(wildcard $(ENGLISHDIR)/News/2003/2003*.wml) $(GETTEXTDEP)
+include $(subst webwml/russian,webwml/english,$(CURDIR))/Makefile
diff --git a/russian/security/2002/Makefile b/russian/security/2002/Makefile
index 27e697998af..10484184c17 100644
--- a/russian/security/2002/Makefile
+++ b/russian/security/2002/Makefile
@@ -1,19 +1 @@
-# This Makefile should need no changes from webwml/english/security/2002/Makefile
-# Please send a message to debian-www if you need to modify anything, so the
-# problem can be fixed.
-
-WMLBASE=../..
-CUR_DIR=security/2002
-SUBS=
-
-include $(WMLBASE)/Make.lang
-
-
-%.$(LANGUAGE).html: %.wml $(TEMPLDIR)/security.wml \
-  $(ENGLISHSRCDIR)/$(CUR_DIR)/%.data $(GETTEXTDEP)
-	$(WML) $(<F)
-
-index.$(LANGUAGE).html: index.wml $(wildcard dsa-[0-9]*.wml) \
-  $(ENGLISHSRCDIR)/$(CUR_DIR)/dsa-[0-9]*.data \
-  $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list.wml $(GETTEXTDEP)
-	$(WML) $(<F)
+include $(subst webwml/russian,webwml/english,$(CURDIR))/Makefile
diff --git a/russian/security/2003/Makefile b/russian/security/2003/Makefile
index 7c8f24b744f..10484184c17 100644
--- a/russian/security/2003/Makefile
+++ b/russian/security/2003/Makefile
@@ -1,19 +1 @@
-# This Makefile should need no changes from webwml/english/security/2003/Makefile
-# Please send a message to debian-www if you need to modify anything, so the
-# problem can be fixed.
-
-WMLBASE=../..
-CUR_DIR=security/2003
-SUBS=
-
-include $(WMLBASE)/Make.lang
-
-
-%.$(LANGUAGE).html: %.wml $(TEMPLDIR)/security.wml \
-  $(ENGLISHSRCDIR)/$(CUR_DIR)/%.data $(GETTEXTDEP)
-	$(WML) $(<F)
-
-index.$(LANGUAGE).html: index.wml $(wildcard dsa-[0-9]*.wml) \
-  $(ENGLISHSRCDIR)/$(CUR_DIR)/dsa-[0-9]*.data \
-  $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list.wml $(GETTEXTDEP)
-	$(WML) $(<F)
+include $(subst webwml/russian,webwml/english,$(CURDIR))/Makefile
diff --git a/turkish/CD/Makefile b/turkish/CD/Makefile
index 5136647af0a..5ce126901a8 100644
--- a/turkish/CD/Makefile
+++ b/turkish/CD/Makefile
@@ -1,26 +1 @@
-# This Makefile should need no changes from webwml/english/CD/Makefile
-# Please send a message to debian-www if you need to modify anything
-# so the problem can be fixed.
-
-WMLBASE=..
-CUR_DIR=CD
-SUBS=artwork faq http-ftp jigdo-cd mirroring netinst pictures pik releases vendors
-
-NOGENERICDEP := true
-include $(WMLBASE)/Make.lang
-
-
-ifneq "$(wildcard releases/index.wml)" ""
-RELEASESDEP := releases/index.wml
-else
-RELEASESDEP := $(ENGLISHDIR)/CD/releases/index.wml
-endif
-
-index.$(LANGUAGE).html: index.wml $(TEMPLDIR)/cdimage.wml $(RELEASESDEP)
-	$(WML) $(<F) -I $(ENGLISHDIR)/CD/
-
-misc.$(LANGUAGE).html: misc.wml $(TEMPLDIR)/cdimage.wml
-	$(WML) $(<F)
-
-install::
-	[ -L $(HTMLDIR)/images ] || ln -sf . $(HTMLDIR)/images
+include $(subst webwml/turkish,webwml/english,$(CURDIR))/Makefile
diff --git a/turkish/CD/http-ftp/Makefile b/turkish/CD/http-ftp/Makefile
index f9990cc45eb..5ce126901a8 100644
--- a/turkish/CD/http-ftp/Makefile
+++ b/turkish/CD/http-ftp/Makefile
@@ -1,19 +1 @@
-# This Makefile should need no changes from webwml/english/CD/http-ftp/Makefile
-# Please send a message to debian-www if you need to modify anything
-# so the problem can be fixed.
-
-WMLBASE=../..
-CUR_DIR=CD/http-ftp
-SUBS=
-
-include $(WMLBASE)/Make.lang
-
-index.$(LANGUAGE).html: index.wml $(TEMPLDIR)/cdimage.wml \
-  $(ENGLISHDIR)/CD/http-ftp/cdimage_mirrors.list \
-  $(ENGLISHDIR)/CD/http-ftp/cdimage_fsn_mirrors.list
-
-#ifeq "$(LANGUAGE)" "en"
-$(ENGLISHDIR)/CD/http-ftp/cdimage_mirrors.list: \
-  $(ENGLISHDIR)/mirror/mirror_list.pl $(ENGLISHDIR)/mirror/Mirrors.masterlist
-	$< -m $(word 2,$^) -t cdimages-httpftp > $@
-#endif
+include $(subst webwml/turkish,webwml/english,$(CURDIR))/Makefile
diff --git a/turkish/News/2002/Makefile b/turkish/News/2002/Makefile
index b0ca70fdb9f..5ce126901a8 100644
--- a/turkish/News/2002/Makefile
+++ b/turkish/News/2002/Makefile
@@ -1,15 +1 @@
-# This Makefile should need no changes from webwml/english/News/2002/Makefile
-# Please send a message to debian-www if you need to modify anything
-# so the problem can be fixed.
-
-WMLBASE=../..
-CUR_DIR=News/2002
-SUBS=
-
-include $(WMLBASE)/Make.lang
-
-%.$(LANGUAGE).html: %.wml $(TEMPLDIR)/news.wml
-	$(WML) $(<F)
-index.$(LANGUAGE).html: index.wml $(TEMPLDIR)/template.wml \
-  $(TEMPLDIR)/recent_list.wml $(wildcard 2002*.wml) \
-  $(wildcard $(ENGLISHDIR)/News/2002/2002*.wml)
+include $(subst webwml/turkish,webwml/english,$(CURDIR))/Makefile
diff --git a/turkish/News/2003/Makefile b/turkish/News/2003/Makefile
index 7032352f012..5ce126901a8 100644
--- a/turkish/News/2003/Makefile
+++ b/turkish/News/2003/Makefile
@@ -1,15 +1 @@
-# This Makefile should need no changes from webwml/english/News/2003/Makefile
-# Please send a message to debian-www if you need to modify anything
-# so the problem can be fixed.
-
-WMLBASE=../..
-CUR_DIR=News/2003
-SUBS=
-
-include $(WMLBASE)/Make.lang
-
-%.$(LANGUAGE).html: %.wml $(TEMPLDIR)/news.wml $(GETTEXTDEP)
-	$(WML) $(<F)
-index.$(LANGUAGE).html: index.wml $(TEMPLDIR)/template.wml \
-  $(TEMPLDIR)/recent_list.wml $(wildcard 2003*.wml) \
-  $(wildcard $(ENGLISHDIR)/News/2003/2003*.wml) $(GETTEXTDEP)
+include $(subst webwml/turkish,webwml/english,$(CURDIR))/Makefile
diff --git a/turkish/consultants/Makefile b/turkish/consultants/Makefile
index 3deb624b0aa..5ce126901a8 100644
--- a/turkish/consultants/Makefile
+++ b/turkish/consultants/Makefile
@@ -1,27 +1 @@
-# This Makefile should need no changes from webwml/english/consultants/Makefile
-# Please send a message to debian-www if you need to modify anything
-# so the problem can be fixed.
-
-WMLBASE=..
-CUR_DIR=consultants
-SUBS=
-
-NOGENERICDEP := true
-GETTEXTFILES += others.mo
-
-include $(WMLBASE)/Make.lang
-
-ifeq ($(LANGUAGE),en)
-$(ENGLISHSRCDIR)/consultants/consultant.inc: consultant.data
-	$(ENGLISHSRCDIR)/consultants/count
-endif
-
-index.$(LANGUAGE).html: index.wml $(TEMPLDIR)/template.wml \
-                        $(ENGLISHSRCDIR)/consultants/consultant.data \
-                        $(ENGLISHSRCDIR)/consultants/consultant.inc \
-                        $(ENGLISHSRCDIR)/consultants/consultant.defs \
-                        $(GETTEXTDEP)
-	$(WML) $(<F)
-
-%.$(LANGUAGE).html: %.wml $(TEMPLDIR)/consultant.wml
-	$(WML) $(<F)
+include $(subst webwml/turkish,webwml/english,$(CURDIR))/Makefile