sync

CVS version numbers

arabic/Makefile: 1.14 -> 1.15 
catalan/Makefile: 1.2 -> 1.3 
chinese/Makefile: 1.29 -> 1.30 
chinese/CD/vendors/Makefile: 1.1 -> 1.2 
chinese/distrib/Makefile: 1.6 -> 1.7 
croatian/Makefile: 1.34 -> 1.35 
croatian/CD/vendors/Makefile: 1.1 -> 1.2 
croatian/distrib/Makefile: 1.11 -> 1.12 
danish/Makefile: 1.21 -> 1.22 
danish/CD/vendors/Makefile: 1.1 -> 1.2 
danish/distrib/Makefile: 1.3 -> 1.4 
dutch/Makefile: 1.15 -> 1.16 
esperanto/Makefile: 1.17 -> 1.18 
finnish/Makefile: 1.21 -> 1.22 
finnish/CD/vendors/Makefile: 1.1 -> 1.2 
finnish/distrib/Makefile: 1.6 -> 1.7 
french/Makefile: 1.33 -> 1.34 
french/CD/vendors/Makefile: 1.1 -> 1.2 
french/distrib/Makefile: 1.9 -> 1.10 
german/Makefile: 1.36 -> 1.37 
german/CD/vendors/Makefile: 1.1 -> 1.2 
german/distrib/Makefile: 1.10 -> 1.11 
greek/Makefile: 1.12 -> 1.13 
hungarian/Makefile: 1.18 -> 1.19 
hungarian/distrib/Makefile: 1.6 -> 1.7 
indonesian/Makefile: 1.1 -> 1.2 
italian/Makefile: 1.41 -> 1.42 
italian/CD/vendors/Makefile: 1.1 -> 1.2 
italian/distrib/Makefile: 1.14 -> 1.15 
japanese/Makefile: 1.37 -> 1.38 
japanese/CD/vendors/Makefile: 1.1 -> 1.2 
japanese/distrib/Makefile: 1.11 -> 1.12 
korean/Makefile: 1.20 -> 1.21 
korean/distrib/Makefile: 1.7 -> 1.8 
norwegian/Makefile: 1.19 -> 1.20 
norwegian/CD/vendors/Makefile: 1.1 -> 1.2 
norwegian/distrib/Makefile: 1.6 -> 1.7 
polish/Makefile: 1.23 -> 1.24 
polish/CD/vendors/Makefile: 1.1 -> 1.2 
polish/distrib/Makefile: 1.5 -> 1.6 
portuguese/Makefile: 1.21 -> 1.22 
portuguese/distrib/Makefile: 1.3 -> 1.4 
romanian/Makefile: 1.23 -> 1.24 
romanian/CD/vendors/Makefile: 1.1 -> 1.2 
romanian/distrib/Makefile: 1.12 -> 1.13 
russian/Makefile: 1.18 -> 1.19 
russian/distrib/Makefile: 1.6 -> 1.7 
spanish/Makefile: 1.34 -> 1.35 
spanish/CD/vendors/Makefile: 1.1 -> 1.2 
spanish/distrib/Makefile: 1.12 -> 1.13 
swedish/Makefile: 1.28 -> 1.29 
swedish/CD/vendors/Makefile: 1.1 -> 1.2 
swedish/distrib/Makefile: 1.10 -> 1.11 
turkish/Makefile: 1.17 -> 1.18 
turkish/distrib/Makefile: 1.3 -> 1.4

55 files changed, 316 insertions, 244 deletions

diff --git a/arabic/Makefile b/arabic/Makefile
index a3a5e20e700..898bf8312bb 100644
--- a/arabic/Makefile
+++ b/arabic/Makefile
@@ -4,9 +4,9 @@
 
 WMLBASE=.
 CUR_DIR=
-SUBS=Bugs MailingLists News Pics banners chinese consultants devel distrib \
-doc events intro international logos mirror misc partners ports releases \
-searchtmpl security vote y2k
+SUBS=Bugs CD MailingLists News Pics banners chinese consultants devel \
+distrib doc events intro international logos mirror misc partners ports \
+releases searchtmpl security vote y2k
 
 ifneq "$(wildcard om_svenska/Makefile)" ""
 SUBS += om_svenska
@@ -23,11 +23,6 @@ SITEMAP = $(sort $(foreach i,$(SUBLANG),\
 HTMLMAP = $(patsubst %.html,$(HTMLDIR)/%.html,$(SITEMAP))
 endif
 
-ifeq "$(LANGUAGE)" "en"
-IMGFILES += favicon.ico
-IMGDESTFILES += $(HTMLDIR)/favicon.ico
-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) \
@@ -68,4 +63,12 @@ endif
 all:: $(SITEMAP)
 
 install:: $(HTMLMAP)
+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
diff --git a/catalan/Makefile b/catalan/Makefile
index a3a5e20e700..898bf8312bb 100644
--- a/catalan/Makefile
+++ b/catalan/Makefile
@@ -4,9 +4,9 @@
 
 WMLBASE=.
 CUR_DIR=
-SUBS=Bugs MailingLists News Pics banners chinese consultants devel distrib \
-doc events intro international logos mirror misc partners ports releases \
-searchtmpl security vote y2k
+SUBS=Bugs CD MailingLists News Pics banners chinese consultants devel \
+distrib doc events intro international logos mirror misc partners ports \
+releases searchtmpl security vote y2k
 
 ifneq "$(wildcard om_svenska/Makefile)" ""
 SUBS += om_svenska
@@ -23,11 +23,6 @@ SITEMAP = $(sort $(foreach i,$(SUBLANG),\
 HTMLMAP = $(patsubst %.html,$(HTMLDIR)/%.html,$(SITEMAP))
 endif
 
-ifeq "$(LANGUAGE)" "en"
-IMGFILES += favicon.ico
-IMGDESTFILES += $(HTMLDIR)/favicon.ico
-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) \
@@ -68,4 +63,12 @@ endif
 all:: $(SITEMAP)
 
 install:: $(HTMLMAP)
+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
diff --git a/chinese/CD/vendors/Makefile b/chinese/CD/vendors/Makefile
index 12fc4e3539c..ef450298d64 100644
--- a/chinese/CD/vendors/Makefile
+++ b/chinese/CD/vendors/Makefile
@@ -8,3 +8,7 @@ SUBS=
 
 include $(WMLBASE)/Make.lang
 
+vendors.$(LANGUAGE).html: vendors.wml $(TEMPLDIR)/countries.wml \
+  $(TEMPLDIR)/url.wml \
+  $(ENGLISHDIR)/CD/vendors/vendors.CD $(ENGLISHDIR)/CD/vendors/vendors.CD.def
+
diff --git a/chinese/Makefile b/chinese/Makefile
index a3a5e20e700..898bf8312bb 100644
--- a/chinese/Makefile
+++ b/chinese/Makefile
@@ -4,9 +4,9 @@
 
 WMLBASE=.
 CUR_DIR=
-SUBS=Bugs MailingLists News Pics banners chinese consultants devel distrib \
-doc events intro international logos mirror misc partners ports releases \
-searchtmpl security vote y2k
+SUBS=Bugs CD MailingLists News Pics banners chinese consultants devel \
+distrib doc events intro international logos mirror misc partners ports \
+releases searchtmpl security vote y2k
 
 ifneq "$(wildcard om_svenska/Makefile)" ""
 SUBS += om_svenska
@@ -23,11 +23,6 @@ SITEMAP = $(sort $(foreach i,$(SUBLANG),\
 HTMLMAP = $(patsubst %.html,$(HTMLDIR)/%.html,$(SITEMAP))
 endif
 
-ifeq "$(LANGUAGE)" "en"
-IMGFILES += favicon.ico
-IMGDESTFILES += $(HTMLDIR)/favicon.ico
-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) \
@@ -68,4 +63,12 @@ endif
 all:: $(SITEMAP)
 
 install:: $(HTMLMAP)
+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
diff --git a/chinese/distrib/Makefile b/chinese/distrib/Makefile
index e48d1b3f239..051be51f248 100644
--- a/chinese/distrib/Makefile
+++ b/chinese/distrib/Makefile
@@ -12,10 +12,7 @@ ftplist.$(LANGUAGE).html: ftplist.wml $(ENGLISHSRCDIR)/distrib/ftplist.data \
   $(TEMPLDIR)/countries.wml
 packages.$(LANGUAGE).html: packages.wml $(ENGLISHSRCDIR)/releases/info
 pre-installed.$(LANGUAGE).html: pre-installed.wml $(TEMPLDIR)/countries.wml \
-  $(ENGLISHSRCDIR)/distrib/pre-installed.data $(ENGLISHSRCDIR)/distrib/vendors.CD.def
-vendors.$(LANGUAGE).html: vendors.wml $(TEMPLDIR)/countries.wml \
-  $(TEMPLDIR)/url.wml \
-  $(ENGLISHSRCDIR)/distrib/vendors.CD $(ENGLISHSRCDIR)/distrib/vendors.CD.def
+  $(ENGLISHDIR)/distrib/pre-installed.data $(ENGLISHDIR)/CD/vendors/vendors.CD.def
 
 ifeq "$(LANGUAGE)" "en"
 $(ENGLISHSRCDIR)/distrib/ftplist.data: ftplist.data
diff --git a/croatian/CD/vendors/Makefile b/croatian/CD/vendors/Makefile
index 12fc4e3539c..ef450298d64 100644
--- a/croatian/CD/vendors/Makefile
+++ b/croatian/CD/vendors/Makefile
@@ -8,3 +8,7 @@ SUBS=
 
 include $(WMLBASE)/Make.lang
 
+vendors.$(LANGUAGE).html: vendors.wml $(TEMPLDIR)/countries.wml \
+  $(TEMPLDIR)/url.wml \
+  $(ENGLISHDIR)/CD/vendors/vendors.CD $(ENGLISHDIR)/CD/vendors/vendors.CD.def
+
diff --git a/croatian/Makefile b/croatian/Makefile
index a3a5e20e700..898bf8312bb 100644
--- a/croatian/Makefile
+++ b/croatian/Makefile
@@ -4,9 +4,9 @@
 
 WMLBASE=.
 CUR_DIR=
-SUBS=Bugs MailingLists News Pics banners chinese consultants devel distrib \
-doc events intro international logos mirror misc partners ports releases \
-searchtmpl security vote y2k
+SUBS=Bugs CD MailingLists News Pics banners chinese consultants devel \
+distrib doc events intro international logos mirror misc partners ports \
+releases searchtmpl security vote y2k
 
 ifneq "$(wildcard om_svenska/Makefile)" ""
 SUBS += om_svenska
@@ -23,11 +23,6 @@ SITEMAP = $(sort $(foreach i,$(SUBLANG),\
 HTMLMAP = $(patsubst %.html,$(HTMLDIR)/%.html,$(SITEMAP))
 endif
 
-ifeq "$(LANGUAGE)" "en"
-IMGFILES += favicon.ico
-IMGDESTFILES += $(HTMLDIR)/favicon.ico
-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) \
@@ -68,4 +63,12 @@ endif
 all:: $(SITEMAP)
 
 install:: $(HTMLMAP)
+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
diff --git a/croatian/distrib/Makefile b/croatian/distrib/Makefile
index e48d1b3f239..051be51f248 100644
--- a/croatian/distrib/Makefile
+++ b/croatian/distrib/Makefile
@@ -12,10 +12,7 @@ ftplist.$(LANGUAGE).html: ftplist.wml $(ENGLISHSRCDIR)/distrib/ftplist.data \
   $(TEMPLDIR)/countries.wml
 packages.$(LANGUAGE).html: packages.wml $(ENGLISHSRCDIR)/releases/info
 pre-installed.$(LANGUAGE).html: pre-installed.wml $(TEMPLDIR)/countries.wml \
-  $(ENGLISHSRCDIR)/distrib/pre-installed.data $(ENGLISHSRCDIR)/distrib/vendors.CD.def
-vendors.$(LANGUAGE).html: vendors.wml $(TEMPLDIR)/countries.wml \
-  $(TEMPLDIR)/url.wml \
-  $(ENGLISHSRCDIR)/distrib/vendors.CD $(ENGLISHSRCDIR)/distrib/vendors.CD.def
+  $(ENGLISHDIR)/distrib/pre-installed.data $(ENGLISHDIR)/CD/vendors/vendors.CD.def
 
 ifeq "$(LANGUAGE)" "en"
 $(ENGLISHSRCDIR)/distrib/ftplist.data: ftplist.data
diff --git a/danish/CD/vendors/Makefile b/danish/CD/vendors/Makefile
index 12fc4e3539c..ef450298d64 100644
--- a/danish/CD/vendors/Makefile
+++ b/danish/CD/vendors/Makefile
@@ -8,3 +8,7 @@ SUBS=
 
 include $(WMLBASE)/Make.lang
 
+vendors.$(LANGUAGE).html: vendors.wml $(TEMPLDIR)/countries.wml \
+  $(TEMPLDIR)/url.wml \
+  $(ENGLISHDIR)/CD/vendors/vendors.CD $(ENGLISHDIR)/CD/vendors/vendors.CD.def
+
diff --git a/danish/Makefile b/danish/Makefile
index a3a5e20e700..898bf8312bb 100644
--- a/danish/Makefile
+++ b/danish/Makefile
@@ -4,9 +4,9 @@
 
 WMLBASE=.
 CUR_DIR=
-SUBS=Bugs MailingLists News Pics banners chinese consultants devel distrib \
-doc events intro international logos mirror misc partners ports releases \
-searchtmpl security vote y2k
+SUBS=Bugs CD MailingLists News Pics banners chinese consultants devel \
+distrib doc events intro international logos mirror misc partners ports \
+releases searchtmpl security vote y2k
 
 ifneq "$(wildcard om_svenska/Makefile)" ""
 SUBS += om_svenska
@@ -23,11 +23,6 @@ SITEMAP = $(sort $(foreach i,$(SUBLANG),\
 HTMLMAP = $(patsubst %.html,$(HTMLDIR)/%.html,$(SITEMAP))
 endif
 
-ifeq "$(LANGUAGE)" "en"
-IMGFILES += favicon.ico
-IMGDESTFILES += $(HTMLDIR)/favicon.ico
-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) \
@@ -68,4 +63,12 @@ endif
 all:: $(SITEMAP)
 
 install:: $(HTMLMAP)
+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
diff --git a/danish/distrib/Makefile b/danish/distrib/Makefile
index e48d1b3f239..051be51f248 100644
--- a/danish/distrib/Makefile
+++ b/danish/distrib/Makefile
@@ -12,10 +12,7 @@ ftplist.$(LANGUAGE).html: ftplist.wml $(ENGLISHSRCDIR)/distrib/ftplist.data \
   $(TEMPLDIR)/countries.wml
 packages.$(LANGUAGE).html: packages.wml $(ENGLISHSRCDIR)/releases/info
 pre-installed.$(LANGUAGE).html: pre-installed.wml $(TEMPLDIR)/countries.wml \
-  $(ENGLISHSRCDIR)/distrib/pre-installed.data $(ENGLISHSRCDIR)/distrib/vendors.CD.def
-vendors.$(LANGUAGE).html: vendors.wml $(TEMPLDIR)/countries.wml \
-  $(TEMPLDIR)/url.wml \
-  $(ENGLISHSRCDIR)/distrib/vendors.CD $(ENGLISHSRCDIR)/distrib/vendors.CD.def
+  $(ENGLISHDIR)/distrib/pre-installed.data $(ENGLISHDIR)/CD/vendors/vendors.CD.def
 
 ifeq "$(LANGUAGE)" "en"
 $(ENGLISHSRCDIR)/distrib/ftplist.data: ftplist.data
diff --git a/dutch/Makefile b/dutch/Makefile
index a3a5e20e700..898bf8312bb 100644
--- a/dutch/Makefile
+++ b/dutch/Makefile
@@ -4,9 +4,9 @@
 
 WMLBASE=.
 CUR_DIR=
-SUBS=Bugs MailingLists News Pics banners chinese consultants devel distrib \
-doc events intro international logos mirror misc partners ports releases \
-searchtmpl security vote y2k
+SUBS=Bugs CD MailingLists News Pics banners chinese consultants devel \
+distrib doc events intro international logos mirror misc partners ports \
+releases searchtmpl security vote y2k
 
 ifneq "$(wildcard om_svenska/Makefile)" ""
 SUBS += om_svenska
@@ -23,11 +23,6 @@ SITEMAP = $(sort $(foreach i,$(SUBLANG),\
 HTMLMAP = $(patsubst %.html,$(HTMLDIR)/%.html,$(SITEMAP))
 endif
 
-ifeq "$(LANGUAGE)" "en"
-IMGFILES += favicon.ico
-IMGDESTFILES += $(HTMLDIR)/favicon.ico
-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) \
@@ -68,4 +63,12 @@ endif
 all:: $(SITEMAP)
 
 install:: $(HTMLMAP)
+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
diff --git a/esperanto/Makefile b/esperanto/Makefile
index a3a5e20e700..898bf8312bb 100644
--- a/esperanto/Makefile
+++ b/esperanto/Makefile
@@ -4,9 +4,9 @@
 
 WMLBASE=.
 CUR_DIR=
-SUBS=Bugs MailingLists News Pics banners chinese consultants devel distrib \
-doc events intro international logos mirror misc partners ports releases \
-searchtmpl security vote y2k
+SUBS=Bugs CD MailingLists News Pics banners chinese consultants devel \
+distrib doc events intro international logos mirror misc partners ports \
+releases searchtmpl security vote y2k
 
 ifneq "$(wildcard om_svenska/Makefile)" ""
 SUBS += om_svenska
@@ -23,11 +23,6 @@ SITEMAP = $(sort $(foreach i,$(SUBLANG),\
 HTMLMAP = $(patsubst %.html,$(HTMLDIR)/%.html,$(SITEMAP))
 endif
 
-ifeq "$(LANGUAGE)" "en"
-IMGFILES += favicon.ico
-IMGDESTFILES += $(HTMLDIR)/favicon.ico
-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) \
@@ -68,4 +63,12 @@ endif
 all:: $(SITEMAP)
 
 install:: $(HTMLMAP)
+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
diff --git a/finnish/CD/vendors/Makefile b/finnish/CD/vendors/Makefile
index 12fc4e3539c..ef450298d64 100644
--- a/finnish/CD/vendors/Makefile
+++ b/finnish/CD/vendors/Makefile
@@ -8,3 +8,7 @@ SUBS=
 
 include $(WMLBASE)/Make.lang
 
+vendors.$(LANGUAGE).html: vendors.wml $(TEMPLDIR)/countries.wml \
+  $(TEMPLDIR)/url.wml \
+  $(ENGLISHDIR)/CD/vendors/vendors.CD $(ENGLISHDIR)/CD/vendors/vendors.CD.def
+
diff --git a/finnish/Makefile b/finnish/Makefile
index a3a5e20e700..898bf8312bb 100644
--- a/finnish/Makefile
+++ b/finnish/Makefile
@@ -4,9 +4,9 @@
 
 WMLBASE=.
 CUR_DIR=
-SUBS=Bugs MailingLists News Pics banners chinese consultants devel distrib \
-doc events intro international logos mirror misc partners ports releases \
-searchtmpl security vote y2k
+SUBS=Bugs CD MailingLists News Pics banners chinese consultants devel \
+distrib doc events intro international logos mirror misc partners ports \
+releases searchtmpl security vote y2k
 
 ifneq "$(wildcard om_svenska/Makefile)" ""
 SUBS += om_svenska
@@ -23,11 +23,6 @@ SITEMAP = $(sort $(foreach i,$(SUBLANG),\
 HTMLMAP = $(patsubst %.html,$(HTMLDIR)/%.html,$(SITEMAP))
 endif
 
-ifeq "$(LANGUAGE)" "en"
-IMGFILES += favicon.ico
-IMGDESTFILES += $(HTMLDIR)/favicon.ico
-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) \
@@ -68,4 +63,12 @@ endif
 all:: $(SITEMAP)
 
 install:: $(HTMLMAP)
+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
diff --git a/finnish/distrib/Makefile b/finnish/distrib/Makefile
index e48d1b3f239..051be51f248 100644
--- a/finnish/distrib/Makefile
+++ b/finnish/distrib/Makefile
@@ -12,10 +12,7 @@ ftplist.$(LANGUAGE).html: ftplist.wml $(ENGLISHSRCDIR)/distrib/ftplist.data \
   $(TEMPLDIR)/countries.wml
 packages.$(LANGUAGE).html: packages.wml $(ENGLISHSRCDIR)/releases/info
 pre-installed.$(LANGUAGE).html: pre-installed.wml $(TEMPLDIR)/countries.wml \
-  $(ENGLISHSRCDIR)/distrib/pre-installed.data $(ENGLISHSRCDIR)/distrib/vendors.CD.def
-vendors.$(LANGUAGE).html: vendors.wml $(TEMPLDIR)/countries.wml \
-  $(TEMPLDIR)/url.wml \
-  $(ENGLISHSRCDIR)/distrib/vendors.CD $(ENGLISHSRCDIR)/distrib/vendors.CD.def
+  $(ENGLISHDIR)/distrib/pre-installed.data $(ENGLISHDIR)/CD/vendors/vendors.CD.def
 
 ifeq "$(LANGUAGE)" "en"
 $(ENGLISHSRCDIR)/distrib/ftplist.data: ftplist.data
diff --git a/french/CD/vendors/Makefile b/french/CD/vendors/Makefile
index 12fc4e3539c..ef450298d64 100644
--- a/french/CD/vendors/Makefile
+++ b/french/CD/vendors/Makefile
@@ -8,3 +8,7 @@ SUBS=
 
 include $(WMLBASE)/Make.lang
 
+vendors.$(LANGUAGE).html: vendors.wml $(TEMPLDIR)/countries.wml \
+  $(TEMPLDIR)/url.wml \
+  $(ENGLISHDIR)/CD/vendors/vendors.CD $(ENGLISHDIR)/CD/vendors/vendors.CD.def
+
diff --git a/french/Makefile b/french/Makefile
index a3a5e20e700..898bf8312bb 100644
--- a/french/Makefile
+++ b/french/Makefile
@@ -4,9 +4,9 @@
 
 WMLBASE=.
 CUR_DIR=
-SUBS=Bugs MailingLists News Pics banners chinese consultants devel distrib \
-doc events intro international logos mirror misc partners ports releases \
-searchtmpl security vote y2k
+SUBS=Bugs CD MailingLists News Pics banners chinese consultants devel \
+distrib doc events intro international logos mirror misc partners ports \
+releases searchtmpl security vote y2k
 
 ifneq "$(wildcard om_svenska/Makefile)" ""
 SUBS += om_svenska
@@ -23,11 +23,6 @@ SITEMAP = $(sort $(foreach i,$(SUBLANG),\
 HTMLMAP = $(patsubst %.html,$(HTMLDIR)/%.html,$(SITEMAP))
 endif
 
-ifeq "$(LANGUAGE)" "en"
-IMGFILES += favicon.ico
-IMGDESTFILES += $(HTMLDIR)/favicon.ico
-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) \
@@ -68,4 +63,12 @@ endif
 all:: $(SITEMAP)
 
 install:: $(HTMLMAP)
+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
diff --git a/french/distrib/Makefile b/french/distrib/Makefile
index e48d1b3f239..051be51f248 100644
--- a/french/distrib/Makefile
+++ b/french/distrib/Makefile
@@ -12,10 +12,7 @@ ftplist.$(LANGUAGE).html: ftplist.wml $(ENGLISHSRCDIR)/distrib/ftplist.data \
   $(TEMPLDIR)/countries.wml
 packages.$(LANGUAGE).html: packages.wml $(ENGLISHSRCDIR)/releases/info
 pre-installed.$(LANGUAGE).html: pre-installed.wml $(TEMPLDIR)/countries.wml \
-  $(ENGLISHSRCDIR)/distrib/pre-installed.data $(ENGLISHSRCDIR)/distrib/vendors.CD.def
-vendors.$(LANGUAGE).html: vendors.wml $(TEMPLDIR)/countries.wml \
-  $(TEMPLDIR)/url.wml \
-  $(ENGLISHSRCDIR)/distrib/vendors.CD $(ENGLISHSRCDIR)/distrib/vendors.CD.def
+  $(ENGLISHDIR)/distrib/pre-installed.data $(ENGLISHDIR)/CD/vendors/vendors.CD.def
 
 ifeq "$(LANGUAGE)" "en"
 $(ENGLISHSRCDIR)/distrib/ftplist.data: ftplist.data
diff --git a/german/CD/vendors/Makefile b/german/CD/vendors/Makefile
index 12fc4e3539c..ef450298d64 100644
--- a/german/CD/vendors/Makefile
+++ b/german/CD/vendors/Makefile
@@ -8,3 +8,7 @@ SUBS=
 
 include $(WMLBASE)/Make.lang
 
+vendors.$(LANGUAGE).html: vendors.wml $(TEMPLDIR)/countries.wml \
+  $(TEMPLDIR)/url.wml \
+  $(ENGLISHDIR)/CD/vendors/vendors.CD $(ENGLISHDIR)/CD/vendors/vendors.CD.def
+
diff --git a/german/Makefile b/german/Makefile
index a3a5e20e700..898bf8312bb 100644
--- a/german/Makefile
+++ b/german/Makefile
@@ -4,9 +4,9 @@
 
 WMLBASE=.
 CUR_DIR=
-SUBS=Bugs MailingLists News Pics banners chinese consultants devel distrib \
-doc events intro international logos mirror misc partners ports releases \
-searchtmpl security vote y2k
+SUBS=Bugs CD MailingLists News Pics banners chinese consultants devel \
+distrib doc events intro international logos mirror misc partners ports \
+releases searchtmpl security vote y2k
 
 ifneq "$(wildcard om_svenska/Makefile)" ""
 SUBS += om_svenska
@@ -23,11 +23,6 @@ SITEMAP = $(sort $(foreach i,$(SUBLANG),\
 HTMLMAP = $(patsubst %.html,$(HTMLDIR)/%.html,$(SITEMAP))
 endif
 
-ifeq "$(LANGUAGE)" "en"
-IMGFILES += favicon.ico
-IMGDESTFILES += $(HTMLDIR)/favicon.ico
-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) \
@@ -68,4 +63,12 @@ endif
 all:: $(SITEMAP)
 
 install:: $(HTMLMAP)
+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
diff --git a/german/distrib/Makefile b/german/distrib/Makefile
index e48d1b3f239..051be51f248 100644
--- a/german/distrib/Makefile
+++ b/german/distrib/Makefile
@@ -12,10 +12,7 @@ ftplist.$(LANGUAGE).html: ftplist.wml $(ENGLISHSRCDIR)/distrib/ftplist.data \
   $(TEMPLDIR)/countries.wml
 packages.$(LANGUAGE).html: packages.wml $(ENGLISHSRCDIR)/releases/info
 pre-installed.$(LANGUAGE).html: pre-installed.wml $(TEMPLDIR)/countries.wml \
-  $(ENGLISHSRCDIR)/distrib/pre-installed.data $(ENGLISHSRCDIR)/distrib/vendors.CD.def
-vendors.$(LANGUAGE).html: vendors.wml $(TEMPLDIR)/countries.wml \
-  $(TEMPLDIR)/url.wml \
-  $(ENGLISHSRCDIR)/distrib/vendors.CD $(ENGLISHSRCDIR)/distrib/vendors.CD.def
+  $(ENGLISHDIR)/distrib/pre-installed.data $(ENGLISHDIR)/CD/vendors/vendors.CD.def
 
 ifeq "$(LANGUAGE)" "en"
 $(ENGLISHSRCDIR)/distrib/ftplist.data: ftplist.data
diff --git a/greek/Makefile b/greek/Makefile
index a3a5e20e700..898bf8312bb 100644
--- a/greek/Makefile
+++ b/greek/Makefile
@@ -4,9 +4,9 @@
 
 WMLBASE=.
 CUR_DIR=
-SUBS=Bugs MailingLists News Pics banners chinese consultants devel distrib \
-doc events intro international logos mirror misc partners ports releases \
-searchtmpl security vote y2k
+SUBS=Bugs CD MailingLists News Pics banners chinese consultants devel \
+distrib doc events intro international logos mirror misc partners ports \
+releases searchtmpl security vote y2k
 
 ifneq "$(wildcard om_svenska/Makefile)" ""
 SUBS += om_svenska
@@ -23,11 +23,6 @@ SITEMAP = $(sort $(foreach i,$(SUBLANG),\
 HTMLMAP = $(patsubst %.html,$(HTMLDIR)/%.html,$(SITEMAP))
 endif
 
-ifeq "$(LANGUAGE)" "en"
-IMGFILES += favicon.ico
-IMGDESTFILES += $(HTMLDIR)/favicon.ico
-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) \
@@ -68,4 +63,12 @@ endif
 all:: $(SITEMAP)
 
 install:: $(HTMLMAP)
+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
diff --git a/hungarian/Makefile b/hungarian/Makefile
index a3a5e20e700..898bf8312bb 100644
--- a/hungarian/Makefile
+++ b/hungarian/Makefile
@@ -4,9 +4,9 @@
 
 WMLBASE=.
 CUR_DIR=
-SUBS=Bugs MailingLists News Pics banners chinese consultants devel distrib \
-doc events intro international logos mirror misc partners ports releases \
-searchtmpl security vote y2k
+SUBS=Bugs CD MailingLists News Pics banners chinese consultants devel \
+distrib doc events intro international logos mirror misc partners ports \
+releases searchtmpl security vote y2k
 
 ifneq "$(wildcard om_svenska/Makefile)" ""
 SUBS += om_svenska
@@ -23,11 +23,6 @@ SITEMAP = $(sort $(foreach i,$(SUBLANG),\
 HTMLMAP = $(patsubst %.html,$(HTMLDIR)/%.html,$(SITEMAP))
 endif
 
-ifeq "$(LANGUAGE)" "en"
-IMGFILES += favicon.ico
-IMGDESTFILES += $(HTMLDIR)/favicon.ico
-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) \
@@ -68,4 +63,12 @@ endif
 all:: $(SITEMAP)
 
 install:: $(HTMLMAP)
+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
diff --git a/hungarian/distrib/Makefile b/hungarian/distrib/Makefile
index e48d1b3f239..051be51f248 100644
--- a/hungarian/distrib/Makefile
+++ b/hungarian/distrib/Makefile
@@ -12,10 +12,7 @@ ftplist.$(LANGUAGE).html: ftplist.wml $(ENGLISHSRCDIR)/distrib/ftplist.data \
   $(TEMPLDIR)/countries.wml
 packages.$(LANGUAGE).html: packages.wml $(ENGLISHSRCDIR)/releases/info
 pre-installed.$(LANGUAGE).html: pre-installed.wml $(TEMPLDIR)/countries.wml \
-  $(ENGLISHSRCDIR)/distrib/pre-installed.data $(ENGLISHSRCDIR)/distrib/vendors.CD.def
-vendors.$(LANGUAGE).html: vendors.wml $(TEMPLDIR)/countries.wml \
-  $(TEMPLDIR)/url.wml \
-  $(ENGLISHSRCDIR)/distrib/vendors.CD $(ENGLISHSRCDIR)/distrib/vendors.CD.def
+  $(ENGLISHDIR)/distrib/pre-installed.data $(ENGLISHDIR)/CD/vendors/vendors.CD.def
 
 ifeq "$(LANGUAGE)" "en"
 $(ENGLISHSRCDIR)/distrib/ftplist.data: ftplist.data
diff --git a/indonesian/Makefile b/indonesian/Makefile
index 76c3b19b0d4..898bf8312bb 100644
--- a/indonesian/Makefile
+++ b/indonesian/Makefile
@@ -4,9 +4,9 @@
 
 WMLBASE=.
 CUR_DIR=
-SUBS=Bugs MailingLists News Pics banners chinese consultants devel distrib \
-doc events intro international logos mirror misc partners ports releases \
-searchtmpl security vote y2k
+SUBS=Bugs CD MailingLists News Pics banners chinese consultants devel \
+distrib doc events intro international logos mirror misc partners ports \
+releases searchtmpl security vote y2k
 
 ifneq "$(wildcard om_svenska/Makefile)" ""
 SUBS += om_svenska
@@ -64,6 +64,11 @@ all:: $(SITEMAP)
 
 install:: $(HTMLMAP)
 ifeq "$(LANGUAGE)" "en"
-	test -f $(HTMLDIR)/favicon.ico || install -m 664 favicon.ico $(HTMLDIR)
-endif
 	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
diff --git a/italian/CD/vendors/Makefile b/italian/CD/vendors/Makefile
index 12fc4e3539c..ef450298d64 100644
--- a/italian/CD/vendors/Makefile
+++ b/italian/CD/vendors/Makefile
@@ -8,3 +8,7 @@ SUBS=
 
 include $(WMLBASE)/Make.lang
 
+vendors.$(LANGUAGE).html: vendors.wml $(TEMPLDIR)/countries.wml \
+  $(TEMPLDIR)/url.wml \
+  $(ENGLISHDIR)/CD/vendors/vendors.CD $(ENGLISHDIR)/CD/vendors/vendors.CD.def
+
diff --git a/italian/Makefile b/italian/Makefile
index a3a5e20e700..898bf8312bb 100644
--- a/italian/Makefile
+++ b/italian/Makefile
@@ -4,9 +4,9 @@
 
 WMLBASE=.
 CUR_DIR=
-SUBS=Bugs MailingLists News Pics banners chinese consultants devel distrib \
-doc events intro international logos mirror misc partners ports releases \
-searchtmpl security vote y2k
+SUBS=Bugs CD MailingLists News Pics banners chinese consultants devel \
+distrib doc events intro international logos mirror misc partners ports \
+releases searchtmpl security vote y2k
 
 ifneq "$(wildcard om_svenska/Makefile)" ""
 SUBS += om_svenska
@@ -23,11 +23,6 @@ SITEMAP = $(sort $(foreach i,$(SUBLANG),\
 HTMLMAP = $(patsubst %.html,$(HTMLDIR)/%.html,$(SITEMAP))
 endif
 
-ifeq "$(LANGUAGE)" "en"
-IMGFILES += favicon.ico
-IMGDESTFILES += $(HTMLDIR)/favicon.ico
-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) \
@@ -68,4 +63,12 @@ endif
 all:: $(SITEMAP)
 
 install:: $(HTMLMAP)
+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
diff --git a/italian/distrib/Makefile b/italian/distrib/Makefile
index e48d1b3f239..051be51f248 100644
--- a/italian/distrib/Makefile
+++ b/italian/distrib/Makefile
@@ -12,10 +12,7 @@ ftplist.$(LANGUAGE).html: ftplist.wml $(ENGLISHSRCDIR)/distrib/ftplist.data \
   $(TEMPLDIR)/countries.wml
 packages.$(LANGUAGE).html: packages.wml $(ENGLISHSRCDIR)/releases/info
 pre-installed.$(LANGUAGE).html: pre-installed.wml $(TEMPLDIR)/countries.wml \
-  $(ENGLISHSRCDIR)/distrib/pre-installed.data $(ENGLISHSRCDIR)/distrib/vendors.CD.def
-vendors.$(LANGUAGE).html: vendors.wml $(TEMPLDIR)/countries.wml \
-  $(TEMPLDIR)/url.wml \
-  $(ENGLISHSRCDIR)/distrib/vendors.CD $(ENGLISHSRCDIR)/distrib/vendors.CD.def
+  $(ENGLISHDIR)/distrib/pre-installed.data $(ENGLISHDIR)/CD/vendors/vendors.CD.def
 
 ifeq "$(LANGUAGE)" "en"
 $(ENGLISHSRCDIR)/distrib/ftplist.data: ftplist.data
diff --git a/japanese/CD/vendors/Makefile b/japanese/CD/vendors/Makefile
index 12fc4e3539c..ef450298d64 100644
--- a/japanese/CD/vendors/Makefile
+++ b/japanese/CD/vendors/Makefile
@@ -8,3 +8,7 @@ SUBS=
 
 include $(WMLBASE)/Make.lang
 
+vendors.$(LANGUAGE).html: vendors.wml $(TEMPLDIR)/countries.wml \
+  $(TEMPLDIR)/url.wml \
+  $(ENGLISHDIR)/CD/vendors/vendors.CD $(ENGLISHDIR)/CD/vendors/vendors.CD.def
+
diff --git a/japanese/Makefile b/japanese/Makefile
index a3a5e20e700..898bf8312bb 100644
--- a/japanese/Makefile
+++ b/japanese/Makefile
@@ -4,9 +4,9 @@
 
 WMLBASE=.
 CUR_DIR=
-SUBS=Bugs MailingLists News Pics banners chinese consultants devel distrib \
-doc events intro international logos mirror misc partners ports releases \
-searchtmpl security vote y2k
+SUBS=Bugs CD MailingLists News Pics banners chinese consultants devel \
+distrib doc events intro international logos mirror misc partners ports \
+releases searchtmpl security vote y2k
 
 ifneq "$(wildcard om_svenska/Makefile)" ""
 SUBS += om_svenska
@@ -23,11 +23,6 @@ SITEMAP = $(sort $(foreach i,$(SUBLANG),\
 HTMLMAP = $(patsubst %.html,$(HTMLDIR)/%.html,$(SITEMAP))
 endif
 
-ifeq "$(LANGUAGE)" "en"
-IMGFILES += favicon.ico
-IMGDESTFILES += $(HTMLDIR)/favicon.ico
-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) \
@@ -68,4 +63,12 @@ endif
 all:: $(SITEMAP)
 
 install:: $(HTMLMAP)
+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
diff --git a/japanese/distrib/Makefile b/japanese/distrib/Makefile
index e48d1b3f239..051be51f248 100644
--- a/japanese/distrib/Makefile
+++ b/japanese/distrib/Makefile
@@ -12,10 +12,7 @@ ftplist.$(LANGUAGE).html: ftplist.wml $(ENGLISHSRCDIR)/distrib/ftplist.data \
   $(TEMPLDIR)/countries.wml
 packages.$(LANGUAGE).html: packages.wml $(ENGLISHSRCDIR)/releases/info
 pre-installed.$(LANGUAGE).html: pre-installed.wml $(TEMPLDIR)/countries.wml \
-  $(ENGLISHSRCDIR)/distrib/pre-installed.data $(ENGLISHSRCDIR)/distrib/vendors.CD.def
-vendors.$(LANGUAGE).html: vendors.wml $(TEMPLDIR)/countries.wml \
-  $(TEMPLDIR)/url.wml \
-  $(ENGLISHSRCDIR)/distrib/vendors.CD $(ENGLISHSRCDIR)/distrib/vendors.CD.def
+  $(ENGLISHDIR)/distrib/pre-installed.data $(ENGLISHDIR)/CD/vendors/vendors.CD.def
 
 ifeq "$(LANGUAGE)" "en"
 $(ENGLISHSRCDIR)/distrib/ftplist.data: ftplist.data
diff --git a/korean/Makefile b/korean/Makefile
index a3a5e20e700..898bf8312bb 100644
--- a/korean/Makefile
+++ b/korean/Makefile
@@ -4,9 +4,9 @@
 
 WMLBASE=.
 CUR_DIR=
-SUBS=Bugs MailingLists News Pics banners chinese consultants devel distrib \
-doc events intro international logos mirror misc partners ports releases \
-searchtmpl security vote y2k
+SUBS=Bugs CD MailingLists News Pics banners chinese consultants devel \
+distrib doc events intro international logos mirror misc partners ports \
+releases searchtmpl security vote y2k
 
 ifneq "$(wildcard om_svenska/Makefile)" ""
 SUBS += om_svenska
@@ -23,11 +23,6 @@ SITEMAP = $(sort $(foreach i,$(SUBLANG),\
 HTMLMAP = $(patsubst %.html,$(HTMLDIR)/%.html,$(SITEMAP))
 endif
 
-ifeq "$(LANGUAGE)" "en"
-IMGFILES += favicon.ico
-IMGDESTFILES += $(HTMLDIR)/favicon.ico
-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) \
@@ -68,4 +63,12 @@ endif
 all:: $(SITEMAP)
 
 install:: $(HTMLMAP)
+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
diff --git a/korean/distrib/Makefile b/korean/distrib/Makefile
index e48d1b3f239..051be51f248 100644
--- a/korean/distrib/Makefile
+++ b/korean/distrib/Makefile
@@ -12,10 +12,7 @@ ftplist.$(LANGUAGE).html: ftplist.wml $(ENGLISHSRCDIR)/distrib/ftplist.data \
   $(TEMPLDIR)/countries.wml
 packages.$(LANGUAGE).html: packages.wml $(ENGLISHSRCDIR)/releases/info
 pre-installed.$(LANGUAGE).html: pre-installed.wml $(TEMPLDIR)/countries.wml \
-  $(ENGLISHSRCDIR)/distrib/pre-installed.data $(ENGLISHSRCDIR)/distrib/vendors.CD.def
-vendors.$(LANGUAGE).html: vendors.wml $(TEMPLDIR)/countries.wml \
-  $(TEMPLDIR)/url.wml \
-  $(ENGLISHSRCDIR)/distrib/vendors.CD $(ENGLISHSRCDIR)/distrib/vendors.CD.def
+  $(ENGLISHDIR)/distrib/pre-installed.data $(ENGLISHDIR)/CD/vendors/vendors.CD.def
 
 ifeq "$(LANGUAGE)" "en"
 $(ENGLISHSRCDIR)/distrib/ftplist.data: ftplist.data
diff --git a/norwegian/CD/vendors/Makefile b/norwegian/CD/vendors/Makefile
index 12fc4e3539c..ef450298d64 100644
--- a/norwegian/CD/vendors/Makefile
+++ b/norwegian/CD/vendors/Makefile
@@ -8,3 +8,7 @@ SUBS=
 
 include $(WMLBASE)/Make.lang
 
+vendors.$(LANGUAGE).html: vendors.wml $(TEMPLDIR)/countries.wml \
+  $(TEMPLDIR)/url.wml \
+  $(ENGLISHDIR)/CD/vendors/vendors.CD $(ENGLISHDIR)/CD/vendors/vendors.CD.def
+
diff --git a/norwegian/Makefile b/norwegian/Makefile
index e0da501795a..898bf8312bb 100644
--- a/norwegian/Makefile
+++ b/norwegian/Makefile
@@ -4,9 +4,9 @@
 
 WMLBASE=.
 CUR_DIR=
-SUBS=Bugs MailingLists News Pics banners chinese consultants devel distrib \
-doc events intro international logos mirror misc partners ports releases \
-searchtmpl security vote y2k
+SUBS=Bugs CD MailingLists News Pics banners chinese consultants devel \
+distrib doc events intro international logos mirror misc partners ports \
+releases searchtmpl security vote y2k
 
 ifneq "$(wildcard om_svenska/Makefile)" ""
 SUBS += om_svenska
@@ -64,7 +64,11 @@ all:: $(SITEMAP)
 
 install:: $(HTMLMAP)
 ifeq "$(LANGUAGE)" "en"
-	test -f $(HTMLDIR)/favicon.ico || install -m 664 favicon.ico $(HTMLDIR)
 	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
diff --git a/norwegian/distrib/Makefile b/norwegian/distrib/Makefile
index e48d1b3f239..051be51f248 100644
--- a/norwegian/distrib/Makefile
+++ b/norwegian/distrib/Makefile
@@ -12,10 +12,7 @@ ftplist.$(LANGUAGE).html: ftplist.wml $(ENGLISHSRCDIR)/distrib/ftplist.data \
   $(TEMPLDIR)/countries.wml
 packages.$(LANGUAGE).html: packages.wml $(ENGLISHSRCDIR)/releases/info
 pre-installed.$(LANGUAGE).html: pre-installed.wml $(TEMPLDIR)/countries.wml \
-  $(ENGLISHSRCDIR)/distrib/pre-installed.data $(ENGLISHSRCDIR)/distrib/vendors.CD.def
-vendors.$(LANGUAGE).html: vendors.wml $(TEMPLDIR)/countries.wml \
-  $(TEMPLDIR)/url.wml \
-  $(ENGLISHSRCDIR)/distrib/vendors.CD $(ENGLISHSRCDIR)/distrib/vendors.CD.def
+  $(ENGLISHDIR)/distrib/pre-installed.data $(ENGLISHDIR)/CD/vendors/vendors.CD.def
 
 ifeq "$(LANGUAGE)" "en"
 $(ENGLISHSRCDIR)/distrib/ftplist.data: ftplist.data
diff --git a/polish/CD/vendors/Makefile b/polish/CD/vendors/Makefile
index 12fc4e3539c..ef450298d64 100644
--- a/polish/CD/vendors/Makefile
+++ b/polish/CD/vendors/Makefile
@@ -8,3 +8,7 @@ SUBS=
 
 include $(WMLBASE)/Make.lang
 
+vendors.$(LANGUAGE).html: vendors.wml $(TEMPLDIR)/countries.wml \
+  $(TEMPLDIR)/url.wml \
+  $(ENGLISHDIR)/CD/vendors/vendors.CD $(ENGLISHDIR)/CD/vendors/vendors.CD.def
+
diff --git a/polish/Makefile b/polish/Makefile
index a3a5e20e700..898bf8312bb 100644
--- a/polish/Makefile
+++ b/polish/Makefile
@@ -4,9 +4,9 @@
 
 WMLBASE=.
 CUR_DIR=
-SUBS=Bugs MailingLists News Pics banners chinese consultants devel distrib \
-doc events intro international logos mirror misc partners ports releases \
-searchtmpl security vote y2k
+SUBS=Bugs CD MailingLists News Pics banners chinese consultants devel \
+distrib doc events intro international logos mirror misc partners ports \
+releases searchtmpl security vote y2k
 
 ifneq "$(wildcard om_svenska/Makefile)" ""
 SUBS += om_svenska
@@ -23,11 +23,6 @@ SITEMAP = $(sort $(foreach i,$(SUBLANG),\
 HTMLMAP = $(patsubst %.html,$(HTMLDIR)/%.html,$(SITEMAP))
 endif
 
-ifeq "$(LANGUAGE)" "en"
-IMGFILES += favicon.ico
-IMGDESTFILES += $(HTMLDIR)/favicon.ico
-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) \
@@ -68,4 +63,12 @@ endif
 all:: $(SITEMAP)
 
 install:: $(HTMLMAP)
+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
diff --git a/polish/distrib/Makefile b/polish/distrib/Makefile
index e48d1b3f239..051be51f248 100644
--- a/polish/distrib/Makefile
+++ b/polish/distrib/Makefile
@@ -12,10 +12,7 @@ ftplist.$(LANGUAGE).html: ftplist.wml $(ENGLISHSRCDIR)/distrib/ftplist.data \
   $(TEMPLDIR)/countries.wml
 packages.$(LANGUAGE).html: packages.wml $(ENGLISHSRCDIR)/releases/info
 pre-installed.$(LANGUAGE).html: pre-installed.wml $(TEMPLDIR)/countries.wml \
-  $(ENGLISHSRCDIR)/distrib/pre-installed.data $(ENGLISHSRCDIR)/distrib/vendors.CD.def
-vendors.$(LANGUAGE).html: vendors.wml $(TEMPLDIR)/countries.wml \
-  $(TEMPLDIR)/url.wml \
-  $(ENGLISHSRCDIR)/distrib/vendors.CD $(ENGLISHSRCDIR)/distrib/vendors.CD.def
+  $(ENGLISHDIR)/distrib/pre-installed.data $(ENGLISHDIR)/CD/vendors/vendors.CD.def
 
 ifeq "$(LANGUAGE)" "en"
 $(ENGLISHSRCDIR)/distrib/ftplist.data: ftplist.data
diff --git a/portuguese/Makefile b/portuguese/Makefile
index a3a5e20e700..898bf8312bb 100644
--- a/portuguese/Makefile
+++ b/portuguese/Makefile
@@ -4,9 +4,9 @@
 
 WMLBASE=.
 CUR_DIR=
-SUBS=Bugs MailingLists News Pics banners chinese consultants devel distrib \
-doc events intro international logos mirror misc partners ports releases \
-searchtmpl security vote y2k
+SUBS=Bugs CD MailingLists News Pics banners chinese consultants devel \
+distrib doc events intro international logos mirror misc partners ports \
+releases searchtmpl security vote y2k
 
 ifneq "$(wildcard om_svenska/Makefile)" ""
 SUBS += om_svenska
@@ -23,11 +23,6 @@ SITEMAP = $(sort $(foreach i,$(SUBLANG),\
 HTMLMAP = $(patsubst %.html,$(HTMLDIR)/%.html,$(SITEMAP))
 endif
 
-ifeq "$(LANGUAGE)" "en"
-IMGFILES += favicon.ico
-IMGDESTFILES += $(HTMLDIR)/favicon.ico
-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) \
@@ -68,4 +63,12 @@ endif
 all:: $(SITEMAP)
 
 install:: $(HTMLMAP)
+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
diff --git a/portuguese/distrib/Makefile b/portuguese/distrib/Makefile
index e48d1b3f239..051be51f248 100644
--- a/portuguese/distrib/Makefile
+++ b/portuguese/distrib/Makefile
@@ -12,10 +12,7 @@ ftplist.$(LANGUAGE).html: ftplist.wml $(ENGLISHSRCDIR)/distrib/ftplist.data \
   $(TEMPLDIR)/countries.wml
 packages.$(LANGUAGE).html: packages.wml $(ENGLISHSRCDIR)/releases/info
 pre-installed.$(LANGUAGE).html: pre-installed.wml $(TEMPLDIR)/countries.wml \
-  $(ENGLISHSRCDIR)/distrib/pre-installed.data $(ENGLISHSRCDIR)/distrib/vendors.CD.def
-vendors.$(LANGUAGE).html: vendors.wml $(TEMPLDIR)/countries.wml \
-  $(TEMPLDIR)/url.wml \
-  $(ENGLISHSRCDIR)/distrib/vendors.CD $(ENGLISHSRCDIR)/distrib/vendors.CD.def
+  $(ENGLISHDIR)/distrib/pre-installed.data $(ENGLISHDIR)/CD/vendors/vendors.CD.def
 
 ifeq "$(LANGUAGE)" "en"
 $(ENGLISHSRCDIR)/distrib/ftplist.data: ftplist.data
diff --git a/romanian/CD/vendors/Makefile b/romanian/CD/vendors/Makefile
index 12fc4e3539c..ef450298d64 100644
--- a/romanian/CD/vendors/Makefile
+++ b/romanian/CD/vendors/Makefile
@@ -8,3 +8,7 @@ SUBS=
 
 include $(WMLBASE)/Make.lang
 
+vendors.$(LANGUAGE).html: vendors.wml $(TEMPLDIR)/countries.wml \
+  $(TEMPLDIR)/url.wml \
+  $(ENGLISHDIR)/CD/vendors/vendors.CD $(ENGLISHDIR)/CD/vendors/vendors.CD.def
+
diff --git a/romanian/Makefile b/romanian/Makefile
index e0da501795a..898bf8312bb 100644
--- a/romanian/Makefile
+++ b/romanian/Makefile
@@ -4,9 +4,9 @@
 
 WMLBASE=.
 CUR_DIR=
-SUBS=Bugs MailingLists News Pics banners chinese consultants devel distrib \
-doc events intro international logos mirror misc partners ports releases \
-searchtmpl security vote y2k
+SUBS=Bugs CD MailingLists News Pics banners chinese consultants devel \
+distrib doc events intro international logos mirror misc partners ports \
+releases searchtmpl security vote y2k
 
 ifneq "$(wildcard om_svenska/Makefile)" ""
 SUBS += om_svenska
@@ -64,7 +64,11 @@ all:: $(SITEMAP)
 
 install:: $(HTMLMAP)
 ifeq "$(LANGUAGE)" "en"
-	test -f $(HTMLDIR)/favicon.ico || install -m 664 favicon.ico $(HTMLDIR)
 	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
diff --git a/romanian/distrib/Makefile b/romanian/distrib/Makefile
index e48d1b3f239..051be51f248 100644
--- a/romanian/distrib/Makefile
+++ b/romanian/distrib/Makefile
@@ -12,10 +12,7 @@ ftplist.$(LANGUAGE).html: ftplist.wml $(ENGLISHSRCDIR)/distrib/ftplist.data \
   $(TEMPLDIR)/countries.wml
 packages.$(LANGUAGE).html: packages.wml $(ENGLISHSRCDIR)/releases/info
 pre-installed.$(LANGUAGE).html: pre-installed.wml $(TEMPLDIR)/countries.wml \
-  $(ENGLISHSRCDIR)/distrib/pre-installed.data $(ENGLISHSRCDIR)/distrib/vendors.CD.def
-vendors.$(LANGUAGE).html: vendors.wml $(TEMPLDIR)/countries.wml \
-  $(TEMPLDIR)/url.wml \
-  $(ENGLISHSRCDIR)/distrib/vendors.CD $(ENGLISHSRCDIR)/distrib/vendors.CD.def
+  $(ENGLISHDIR)/distrib/pre-installed.data $(ENGLISHDIR)/CD/vendors/vendors.CD.def
 
 ifeq "$(LANGUAGE)" "en"
 $(ENGLISHSRCDIR)/distrib/ftplist.data: ftplist.data
diff --git a/russian/Makefile b/russian/Makefile
index a3a5e20e700..898bf8312bb 100644
--- a/russian/Makefile
+++ b/russian/Makefile
@@ -4,9 +4,9 @@
 
 WMLBASE=.
 CUR_DIR=
-SUBS=Bugs MailingLists News Pics banners chinese consultants devel distrib \
-doc events intro international logos mirror misc partners ports releases \
-searchtmpl security vote y2k
+SUBS=Bugs CD MailingLists News Pics banners chinese consultants devel \
+distrib doc events intro international logos mirror misc partners ports \
+releases searchtmpl security vote y2k
 
 ifneq "$(wildcard om_svenska/Makefile)" ""
 SUBS += om_svenska
@@ -23,11 +23,6 @@ SITEMAP = $(sort $(foreach i,$(SUBLANG),\
 HTMLMAP = $(patsubst %.html,$(HTMLDIR)/%.html,$(SITEMAP))
 endif
 
-ifeq "$(LANGUAGE)" "en"
-IMGFILES += favicon.ico
-IMGDESTFILES += $(HTMLDIR)/favicon.ico
-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) \
@@ -68,4 +63,12 @@ endif
 all:: $(SITEMAP)
 
 install:: $(HTMLMAP)
+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
diff --git a/russian/distrib/Makefile b/russian/distrib/Makefile
index e48d1b3f239..051be51f248 100644
--- a/russian/distrib/Makefile
+++ b/russian/distrib/Makefile
@@ -12,10 +12,7 @@ ftplist.$(LANGUAGE).html: ftplist.wml $(ENGLISHSRCDIR)/distrib/ftplist.data \
   $(TEMPLDIR)/countries.wml
 packages.$(LANGUAGE).html: packages.wml $(ENGLISHSRCDIR)/releases/info
 pre-installed.$(LANGUAGE).html: pre-installed.wml $(TEMPLDIR)/countries.wml \
-  $(ENGLISHSRCDIR)/distrib/pre-installed.data $(ENGLISHSRCDIR)/distrib/vendors.CD.def
-vendors.$(LANGUAGE).html: vendors.wml $(TEMPLDIR)/countries.wml \
-  $(TEMPLDIR)/url.wml \
-  $(ENGLISHSRCDIR)/distrib/vendors.CD $(ENGLISHSRCDIR)/distrib/vendors.CD.def
+  $(ENGLISHDIR)/distrib/pre-installed.data $(ENGLISHDIR)/CD/vendors/vendors.CD.def
 
 ifeq "$(LANGUAGE)" "en"
 $(ENGLISHSRCDIR)/distrib/ftplist.data: ftplist.data
diff --git a/spanish/CD/vendors/Makefile b/spanish/CD/vendors/Makefile
index 12fc4e3539c..ef450298d64 100644
--- a/spanish/CD/vendors/Makefile
+++ b/spanish/CD/vendors/Makefile
@@ -8,3 +8,7 @@ SUBS=
 
 include $(WMLBASE)/Make.lang
 
+vendors.$(LANGUAGE).html: vendors.wml $(TEMPLDIR)/countries.wml \
+  $(TEMPLDIR)/url.wml \
+  $(ENGLISHDIR)/CD/vendors/vendors.CD $(ENGLISHDIR)/CD/vendors/vendors.CD.def
+
diff --git a/spanish/Makefile b/spanish/Makefile
index e0da501795a..898bf8312bb 100644
--- a/spanish/Makefile
+++ b/spanish/Makefile
@@ -4,9 +4,9 @@
 
 WMLBASE=.
 CUR_DIR=
-SUBS=Bugs MailingLists News Pics banners chinese consultants devel distrib \
-doc events intro international logos mirror misc partners ports releases \
-searchtmpl security vote y2k
+SUBS=Bugs CD MailingLists News Pics banners chinese consultants devel \
+distrib doc events intro international logos mirror misc partners ports \
+releases searchtmpl security vote y2k
 
 ifneq "$(wildcard om_svenska/Makefile)" ""
 SUBS += om_svenska
@@ -64,7 +64,11 @@ all:: $(SITEMAP)
 
 install:: $(HTMLMAP)
 ifeq "$(LANGUAGE)" "en"
-	test -f $(HTMLDIR)/favicon.ico || install -m 664 favicon.ico $(HTMLDIR)
 	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
diff --git a/spanish/distrib/Makefile b/spanish/distrib/Makefile
index e48d1b3f239..051be51f248 100644
--- a/spanish/distrib/Makefile
+++ b/spanish/distrib/Makefile
@@ -12,10 +12,7 @@ ftplist.$(LANGUAGE).html: ftplist.wml $(ENGLISHSRCDIR)/distrib/ftplist.data \
   $(TEMPLDIR)/countries.wml
 packages.$(LANGUAGE).html: packages.wml $(ENGLISHSRCDIR)/releases/info
 pre-installed.$(LANGUAGE).html: pre-installed.wml $(TEMPLDIR)/countries.wml \
-  $(ENGLISHSRCDIR)/distrib/pre-installed.data $(ENGLISHSRCDIR)/distrib/vendors.CD.def
-vendors.$(LANGUAGE).html: vendors.wml $(TEMPLDIR)/countries.wml \
-  $(TEMPLDIR)/url.wml \
-  $(ENGLISHSRCDIR)/distrib/vendors.CD $(ENGLISHSRCDIR)/distrib/vendors.CD.def
+  $(ENGLISHDIR)/distrib/pre-installed.data $(ENGLISHDIR)/CD/vendors/vendors.CD.def
 
 ifeq "$(LANGUAGE)" "en"
 $(ENGLISHSRCDIR)/distrib/ftplist.data: ftplist.data
diff --git a/swedish/CD/vendors/Makefile b/swedish/CD/vendors/Makefile
index 12fc4e3539c..ef450298d64 100644
--- a/swedish/CD/vendors/Makefile
+++ b/swedish/CD/vendors/Makefile
@@ -8,3 +8,7 @@ SUBS=
 
 include $(WMLBASE)/Make.lang
 
+vendors.$(LANGUAGE).html: vendors.wml $(TEMPLDIR)/countries.wml \
+  $(TEMPLDIR)/url.wml \
+  $(ENGLISHDIR)/CD/vendors/vendors.CD $(ENGLISHDIR)/CD/vendors/vendors.CD.def
+
diff --git a/swedish/Makefile b/swedish/Makefile
index 57e9f30c882..898bf8312bb 100644
--- a/swedish/Makefile
+++ b/swedish/Makefile
@@ -4,9 +4,9 @@
 
 WMLBASE=.
 CUR_DIR=
-SUBS=Bugs MailingLists News Pics banners chinese consultants devel distrib \
-doc events intro international logos mirror misc partners ports releases \
-searchtmpl security vote y2k
+SUBS=Bugs CD MailingLists News Pics banners chinese consultants devel \
+distrib doc events intro international logos mirror misc partners ports \
+releases searchtmpl security vote y2k
 
 ifneq "$(wildcard om_svenska/Makefile)" ""
 SUBS += om_svenska
diff --git a/swedish/distrib/Makefile b/swedish/distrib/Makefile
index e48d1b3f239..051be51f248 100644
--- a/swedish/distrib/Makefile
+++ b/swedish/distrib/Makefile
@@ -12,10 +12,7 @@ ftplist.$(LANGUAGE).html: ftplist.wml $(ENGLISHSRCDIR)/distrib/ftplist.data \
   $(TEMPLDIR)/countries.wml
 packages.$(LANGUAGE).html: packages.wml $(ENGLISHSRCDIR)/releases/info
 pre-installed.$(LANGUAGE).html: pre-installed.wml $(TEMPLDIR)/countries.wml \
-  $(ENGLISHSRCDIR)/distrib/pre-installed.data $(ENGLISHSRCDIR)/distrib/vendors.CD.def
-vendors.$(LANGUAGE).html: vendors.wml $(TEMPLDIR)/countries.wml \
-  $(TEMPLDIR)/url.wml \
-  $(ENGLISHSRCDIR)/distrib/vendors.CD $(ENGLISHSRCDIR)/distrib/vendors.CD.def
+  $(ENGLISHDIR)/distrib/pre-installed.data $(ENGLISHDIR)/CD/vendors/vendors.CD.def
 
 ifeq "$(LANGUAGE)" "en"
 $(ENGLISHSRCDIR)/distrib/ftplist.data: ftplist.data
diff --git a/turkish/Makefile b/turkish/Makefile
index a3a5e20e700..898bf8312bb 100644
--- a/turkish/Makefile
+++ b/turkish/Makefile
@@ -4,9 +4,9 @@
 
 WMLBASE=.
 CUR_DIR=
-SUBS=Bugs MailingLists News Pics banners chinese consultants devel distrib \
-doc events intro international logos mirror misc partners ports releases \
-searchtmpl security vote y2k
+SUBS=Bugs CD MailingLists News Pics banners chinese consultants devel \
+distrib doc events intro international logos mirror misc partners ports \
+releases searchtmpl security vote y2k
 
 ifneq "$(wildcard om_svenska/Makefile)" ""
 SUBS += om_svenska
@@ -23,11 +23,6 @@ SITEMAP = $(sort $(foreach i,$(SUBLANG),\
 HTMLMAP = $(patsubst %.html,$(HTMLDIR)/%.html,$(SITEMAP))
 endif
 
-ifeq "$(LANGUAGE)" "en"
-IMGFILES += favicon.ico
-IMGDESTFILES += $(HTMLDIR)/favicon.ico
-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) \
@@ -68,4 +63,12 @@ endif
 all:: $(SITEMAP)
 
 install:: $(HTMLMAP)
+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
diff --git a/turkish/distrib/Makefile b/turkish/distrib/Makefile
index e48d1b3f239..051be51f248 100644
--- a/turkish/distrib/Makefile
+++ b/turkish/distrib/Makefile
@@ -12,10 +12,7 @@ ftplist.$(LANGUAGE).html: ftplist.wml $(ENGLISHSRCDIR)/distrib/ftplist.data \
   $(TEMPLDIR)/countries.wml
 packages.$(LANGUAGE).html: packages.wml $(ENGLISHSRCDIR)/releases/info
 pre-installed.$(LANGUAGE).html: pre-installed.wml $(TEMPLDIR)/countries.wml \
-  $(ENGLISHSRCDIR)/distrib/pre-installed.data $(ENGLISHSRCDIR)/distrib/vendors.CD.def
-vendors.$(LANGUAGE).html: vendors.wml $(TEMPLDIR)/countries.wml \
-  $(TEMPLDIR)/url.wml \
-  $(ENGLISHSRCDIR)/distrib/vendors.CD $(ENGLISHSRCDIR)/distrib/vendors.CD.def
+  $(ENGLISHDIR)/distrib/pre-installed.data $(ENGLISHDIR)/CD/vendors/vendors.CD.def
 
 ifeq "$(LANGUAGE)" "en"
 $(ENGLISHSRCDIR)/distrib/ftplist.data: ftplist.data