Replace Makefiles by a single line

  include $(subst webwml/french,webwml/english,$(shell pwd))/Makefile
in order to always include english/ Makefiles

CVS version numbers

french/Makefile: 1.37 -> 1.38 
french/Bugs/Makefile: 1.6 -> 1.7 
french/CD/Makefile: 1.3 -> 1.4 
french/CD/releases/Makefile: 1.1 -> 1.2 
french/CD/vendors/Makefile: 1.4 -> 1.5 
french/MailingLists/Makefile: 1.5 -> 1.6 
french/News/Makefile: 1.8 -> 1.9 
french/News/1997/Makefile: 1.4 -> 1.5 
french/News/1998/Makefile: 1.4 -> 1.5 
french/News/1999/Makefile: 1.2 -> 1.3 
french/News/2000/Makefile: 1.1 -> 1.2 
french/News/2001/Makefile: 1.1 -> 1.2 
french/News/2002/Makefile: 1.1 -> 1.2 
french/News/weekly/Makefile: 1.10 -> 1.11 
french/Pics/Makefile: 1.8 -> 1.9 
french/devel/Makefile: 1.9 -> 1.10 
french/devel/join/Makefile: 1.1 -> 1.2 
french/devel/website/Makefile: 1.1 -> 1.2 
french/distrib/Makefile: 1.10 -> 1.11 
french/doc/Makefile: 1.6 -> 1.7 
french/events/Makefile: 1.5 -> 1.6 
french/events/2001/Makefile: 1.2 -> 1.3 
french/international/Makefile: 1.14 -> 1.15 
french/international/Chinese/Makefile: 1.2 -> 1.3 
french/international/German/Makefile: 1.1 -> 1.2 
french/international/Polish/Makefile: 1.1 -> 1.2 
french/international/l10n/Makefile: 1.5 -> 1.6 
french/international/l10n/po/Makefile: 1.1 -> 1.2 
french/international/l10n/templates/Makefile: 1.1 -> 1.2 
french/intro/Makefile: 1.6 -> 1.7 
french/logos/Makefile: 1.4 -> 1.5 
french/mirror/Makefile: 1.6 -> 1.7 
french/misc/Makefile: 1.2 -> 1.3 
french/misc/laptops/Makefile: 1.2 -> 1.3 
french/ports/Makefile: 1.6 -> 1.7 
french/ports/alpha/Makefile: 1.3 -> 1.4 
french/ports/arm/Makefile: 1.3 -> 1.4 
french/ports/beowulf/Makefile: 1.1 -> 1.2 
french/ports/hppa/Makefile: 1.1 -> 1.2 
french/ports/hurd/Makefile: 1.2 -> 1.3 
french/ports/i386/Makefile: 1.1 -> 1.2 
french/ports/ia64/Makefile: 1.1 -> 1.2 
french/ports/m68k/Makefile: 1.1 -> 1.2 
french/ports/powerpc/Makefile: 1.4 -> 1.5 
french/ports/s390/Makefile: 1.1 -> 1.2 
french/ports/sparc/Makefile: 1.3 -> 1.4 
french/ports/sparc64/Makefile: 1.1 -> 1.2 
french/releases/Makefile: 1.3 -> 1.4 
french/releases/hamm/Makefile: 1.2 -> 1.3 
french/releases/potato/Makefile: 1.3 -> 1.4 
french/releases/potato/installguide/Makefile: 1.1 -> 1.2 
french/releases/slink/Makefile: 1.2 -> 1.3 
french/releases/woody/Makefile: 1.3 -> 1.4 
french/searchtmpl/Makefile: 1.1 -> 1.2 
french/security/Makefile: 1.11 -> 1.12 
french/security/2001/Makefile: 1.1 -> 1.2 
french/security/2002/Makefile: 1.1 -> 1.2 
french/vote/Makefile: 1.3 -> 1.4 
french/y2k/Makefile: 1.2 -> 1.3

1 files changed, 1 insertions, 66 deletions

diff --git a/french/Makefile b/french/Makefile
index 03c2996b67c..cdb4fcd54ee 100644
--- a/french/Makefile
+++ b/french/Makefile
@@ -1,66 +1 @@
-# This Makefile should need no changes from webwml/english/Makefile
-# Please send a message to debian-www if you need to modify anything
-# so the problem can be fixed.
-
-WMLBASE=.
-CUR_DIR=
-SUBS=Bugs CD MailingLists News Pics banners chinese consultants devel \
-distrib doc events intro international legal logos mirror misc partners \
-ports releases searchtmpl security vote y2k
-
-ifneq "$(wildcard om_svenska/Makefile)" ""
-SUBS += om_svenska
-endif
-
-include $(WMLBASE)/Make.lang
-
-ifndef SUBLANG
-SITEMAP = sitemap.$(LANGUAGE).html
-DESTSITEMAP = $(HTMLDIR)/$(SITEMAP)
-else
-SITEMAP = $(sort $(foreach i,$(SUBLANG),\
-	$(patsubst %.wml,%.$(LANGUAGE)-$(i).html,sitemap.wml)))
-DESTSITEMAP = $(patsubst %.html,$(HTMLDIR)/%.html,$(SITEMAP))
-endif
-
-index.$(LANGUAGE).html: index.wml $(TEMPLDIR)/mainpage.wml \
-		$(wildcard News/$(CUR_YEAR)/[0-9]*.wml) $(wildcard $(ENGLISHSRCDIR)/News/$(CUR_YEAR)/[0-9]*.wml) \
-		$(wildcard security/$(CUR_YEAR)/dsa-[0-9]*.wml) $(wildcard $(ENGLISHSRCDIR)/security/$(CUR_YEAR)/dsa-[0-9]*.wml) \
-		$(TEMPLDIR)/ctime.wml $(TEMPLDIR)/recent_list.wml $(TEMPLDIR)/languages.wml \
-		$(ENGLISHSRCDIR)/releases/info
-	$(WML) index.wml
-
-$(SITEMAP): $(ENGLISHDIR)/sitemap.wml $(TEMPLDIR)/card.wml \
-  $(TEMPLDIR)/links.tags.wml $(TEMPLDIR)/template.wml \
-  $(ENGLISHDIR)/releases/info $(ENGLISHDIR)/MailingLists/mklist.tags
-ifeq "$(LANGUAGE)" "zh"
-	$(subst :.zh,:sitemap.zh,$(WML)) \
-          $(shell egrep '^-D (CUR_|CHAR)' .wmlrc) \
-            $(shell echo $(ENGLISHDIR) | sed s,./,,)/sitemap.wml
-	@echo -n " * Converting: [zh_CN.GB2312], "
-	@$(B5TOGB) < sitemap.zh-cn.html.tmp > sitemap.zh-cn.html
-	@rm -f sitemap.zh-cn.html.tmp
-	@$(TOCN) sitemap.zh-cn.html
-	@echo -n "[zh_HK.Big5], "
-	@mv -f sitemap.zh-hk.html.tmp sitemap.zh-hk.html
-	@$(TOHK) sitemap.zh-hk.html
-	@echo "[zh_TW.Big5]."
-	@mv -f sitemap.zh-tw.html.tmp sitemap.zh-tw.html
-	@$(TOTW) sitemap.zh-tw.html
-else
-	$(WML) $(shell egrep '^-D (CUR_|CHAR)' .wmlrc) \
-          $(shell echo $(ENGLISHDIR) | sed s,./,,)/sitemap.wml
-endif
-
-all:: $(SITEMAP)
-
-install:: $(DESTSITEMAP)
-ifeq "$(LANGUAGE)" "en"
-	test -L $(HTMLDIR)/intl || ln -sf international $(HTMLDIR)/intl
-	test -L $(HTMLDIR)/mirrors || ln -sf mirror $(HTMLDIR)/mirrors
-
-install:: $(HTMLDIR)/favicon.ico
-
-$(HTMLDIR)/favicon.ico: favicon.ico
-	install -p -m 664 favicon.ico $(HTMLDIR)
-endif
+include $(subst webwml/french,webwml/english,$(shell pwd))/Makefile