Copied from english.

CVS version numbers

norwegian/News/1997/Makefile: 1.2 -> 1.3 
norwegian/News/2000/Makefile: 1.1 -> 1.2 
norwegian/News/2001/Makefile: 1.1 -> 1.2 
norwegian/doc/Makefile: 1.2 -> 1.3 
norwegian/international/Makefile: 1.3 -> 1.4 
norwegian/intro/Makefile: 1.3 -> 1.4 
norwegian/logos/Makefile: 1.3 -> 1.4 
norwegian/mirror/Makefile: 1.2 -> 1.3 
norwegian/misc/Makefile: 1.2 -> 1.3 
norwegian/partners/Makefile: 1.3 -> 1.4 
norwegian/partners/images/Makefile: 1.2 -> 1.3 
norwegian/ports/Makefile: 1.3 -> 1.4 
norwegian/ports/alpha/Makefile: 1.2 -> 1.3 
norwegian/ports/arm/Makefile: 1.2 -> 1.3 
norwegian/ports/beowulf/Makefile: 1.2 -> 1.3 
norwegian/ports/hurd/Makefile: 1.2 -> 1.3 
norwegian/ports/mips/Makefile: 1.2 -> 1.3 
norwegian/ports/sparc/Makefile: 1.2 -> 1.3 
norwegian/ports/sparc64/Makefile: 1.2 -> 1.3 
norwegian/releases/Makefile: 1.3 -> 1.4 
norwegian/releases/potato/Makefile: 1.3 -> 1.4 
norwegian/releases/woody/Makefile: 1.2 -> 1.3 
norwegian/vote/Makefile: 1.4 -> 1.5 
norwegian/vote/1999/Makefile: 1.2 -> 1.3

1 files changed, 36 insertions, 31 deletions

diff --git a/norwegian/mirror/Makefile b/norwegian/mirror/Makefile
index f15a57d0cf6..4a828eb55cb 100644
--- a/norwegian/mirror/Makefile
+++ b/norwegian/mirror/Makefile
@@ -1,4 +1,4 @@
-# This Makefile should need no changes from webwml/english/devel/mirror/Makefile
+# This Makefile should need no changes from webwml/english/mirror/Makefile
 # Please send a message to debian-www if you need to modify anything
 # so the problem can be fixed.
 
@@ -8,41 +8,46 @@ SUBS=
 
 include $(WMLBASE)/Make.lang
 
-MFILES := ftpsync ftpsync.conf websync websync.conf \
+
+webmirror.$(LANGUAGE).html: webmirror.wml $(TEMPLDIR)/template.wml \
+  $(ENGLISHSRCDIR)/mirror/webmirrors.data
+
+# there only needs to be one version of the following so
+# the non-english directories shouldn't try to install them
+ifeq "$(LANGUAGE)" "en"
+
+# Note: the masterlist file is kept private since it contains e-mail addresses
+mirrorstuff := ftpsync ftpsync.conf websync websync.conf \
 	identity.pub.master.ftp identity.pub.master.web \
-	anonftpsync anonwebsync \
+	anonftpsync \
 	ftpsync-non-US ftpsync-non-US.conf identity.pub.non-US.ftp
-MIRROR_FILES := $(patsubst %,$(HTMLDIR)/%,$(MFILES))
+destmirrorstuff := $(patsubst %,$(HTMLDIR)/%,$(mirrorstuff))
 
-install:: $(MIRROR_FILES)
+install:: $(destmirrorstuff)
+
+$(destmirrorstuff): $(HTMLDIR)/%: %
+	install -m 664 -p $< $(HTMLDIR)
 
 cleandest::
-	-rm -f $(HTMLDEST)/{$(MIRROR_FILES)}
+	rm -f $(destmirrorstuff)
 
+.PHONY: text html
+text: mirror_list.pl Mirrors.masterlist
+	@./mirror_list.pl -m Mirrors.masterlist -t text
+html: mirror_list.pl Mirrors.masterlist
+	@./mirror_list.pl -m Mirrors.masterlist -t html
+full: mirror_list.pl Mirrors.masterlist
+	@./mirror_list.pl -m Mirrors.masterlist -t methods
+nonus: mirror_list.pl Mirrors.masterlist
+	@./mirror_list.pl -m Mirrors.masterlist -t nonus
+
+$(ENGLISHSRCDIR)/mirror/webmirrors.data: webmirrors.data
+webmirrors.data: Mirrors.masterlist
+	echo -e "#use wml::debian::countries\n<define-tag webmirrors>\n<ul>" > $@
+	for i in `grep-dctrl -n -F Site -s Site -r 'www\...\.debian.org' Mirrors.masterlist | sort`; do \
+          xy=`echo $$i | sed -e s/^www.// -e s/.debian.org$$// | tr a-z A-Z`; \
+	  echo -e "<li><a href=\"http://$${i}`grep-dctrl -n -F Site -s WWW-http -X $$i Mirrors.masterlist`\"><$${xy}c></a>" >> $@; \
+	done
+	echo -e "</ul>\n</define-tag>" >> $@
 
-# there only needs to be one version of the following so
-# the non-english directories shouldn't try to install them
-ifeq ($(LANGUAGE),en)
-$(HTMLDIR)/ftpsync: ftpsync
-	cp ftpsync $(HTMLDIR)
-$(HTMLDIR)/ftpsync.conf: ftpsync.conf
-	cp ftpsync.conf $(HTMLDIR)
-$(HTMLDIR)/ftpsync-non-US: ftpsync-non-US
-	cp ftpsync-non-US $(HTMLDIR)
-$(HTMLDIR)/ftpsync-non-US.conf: ftpsync-non-US.conf
-	cp ftpsync-non-US.conf $(HTMLDIR)
-$(HTMLDIR)/websync: websync
-	cp websync $(HTMLDIR)
-$(HTMLDIR)/websync.conf: websync.conf
-	cp websync.conf $(HTMLDIR)
-$(HTMLDIR)/identity.pub.master.ftp: identity.pub.master.ftp
-	cp identity.pub.master.ftp $(HTMLDIR)
-$(HTMLDIR)/identity.pub.non-US.ftp: identity.pub.non-US.ftp
-	cp identity.pub.non-US.ftp $(HTMLDIR)
-$(HTMLDIR)/identity.pub.master.web: identity.pub.master.web
-	cp identity.pub.master.web $(HTMLDIR)
-$(HTMLDIR)/anonftpsync: anonftpsync
-	cp anonftpsync $(HTMLDIR)
-$(HTMLDIR)/anonwebsync: anonwebsync
-	cp anonwebsync $(HTMLDIR)
 endif