Commit c4eee88c authored by Peter Karlsson's avatar Peter Karlsson

Copied from english.

CVS version numbers

norwegian/CD/Makefile: 1.4 -> 1.5 
norwegian/devel/Makefile: 1.4 -> 1.5 
norwegian/distrib/Makefile: 1.8 -> 1.9 
norwegian/doc/Makefile: 1.5 -> 1.6 
norwegian/releases/Makefile: 1.4 -> 1.5 
norwegian/security/Makefile: 1.9 -> 1.10
parent 9c95ddc2
......@@ -17,7 +17,7 @@ RELEASESDEP := $(ENGLISHDIR)/CD/releases/index.wml
endif
index.$(LANGUAGE).html: index.wml $(TEMPLDIR)/cdimage.wml $(RELEASESDEP)
$(WML) $(<F)
$(WML) $(<F) -I $(ENGLISHDIR)/CD/
misc.$(LANGUAGE).html: misc.wml $(TEMPLDIR)/cdimage.wml
$(WML) $(<F)
......
......@@ -4,7 +4,7 @@
WMLBASE=..
CUR_DIR=devel
SUBS=website debian-jr join misc wnpp
SUBS=website debian-jr debian-med join misc wnpp
include $(WMLBASE)/Make.lang
......
......@@ -24,22 +24,30 @@ ftplist.data: ../mirror/Mirrors.masterlist
echo "<ul>" >> $@
for i in `grep-dctrl -n -F Site -s Site -r 'ftp\...\.debian.org' ../mirror/Mirrors.masterlist | sort`; do \
xy=`echo $$i | sed -e s/^ftp.// -e s/.debian.org$$// | tr a-z A-Z`; \
echo "<li><a href=\"http://$${i}`grep-dctrl -n -F Site -s Archive-http -X $$i ../mirror/Mirrors.masterlist`\"><$${xy}c></a>" >> $@; \
echo " (<a href=\"ftp://$${i}`grep-dctrl -n -F Site -s Archive-ftp -X $$i ../mirror/Mirrors.masterlist`\">FTP</a>)" >> $@; \
hpath=`grep-dctrl -n -F Site -s Archive-http -X $$i ../mirror/Mirrors.masterlist`; \
fpath=`grep-dctrl -n -F Site -s Archive-ftp -X $$i ../mirror/Mirrors.masterlist`; \
echo "<li><a href=\"http://$${i}$${hpath}\"><$${xy}c></a>: " >> $@; \
echo "<small>" >> $@; \
echo " <a href=\"http://$${i}$${hpath}\">HTTP</a>" >> $@; \
echo " <a href=\"ftp://$${i}$${fpath}\">FTP</a>" >> $@; \
echo "</small>" >> $@; \
done
echo "</ul>" >> $@
echo "</define-tag>" >> $@
echo "<define-tag nonusmirrors>" >> $@
echo "<ul>" >> $@
for i in `grep-dctrl -n -F Site -s Site -r 'ftp\...\.debian.org' ../mirror/Mirrors.masterlist | sort`; do \
ch=`grep-dctrl -n -F Site -s NonUS-http -X $$i ../mirror/Mirrors.masterlist`; \
cf=`grep-dctrl -n -F Site -s NonUS-ftp -X $$i ../mirror/Mirrors.masterlist`; \
hpath=`grep-dctrl -n -F Site -s NonUS-http -X $$i ../mirror/Mirrors.masterlist`; \
fpath=`grep-dctrl -n -F Site -s NonUS-ftp -X $$i ../mirror/Mirrors.masterlist`; \
xy=`echo $$i | sed -e s/^ftp.// -e s/.debian.org$$// | tr a-z A-Z`; \
if [ "$$ch" ]; then \
echo "<li><a href=\"http://$${i}$${ch}\"><$${xy}c></a>" >> $@; \
if [ "$$cf" ]; then \
echo " (<a href=\"ftp://$${i}$${cf}\">FTP</a>)" >> $@; \
if [ "$$hpath" ]; then \
echo "<li><a href=\"http://$${i}$${hpath}\"><$${xy}c></a>: " >> $@; \
echo "<small>" >> $@; \
echo " <a href=\"http://$${i}$${hpath}\">HTTP</a>" >> $@; \
if [ "$$fpath" ]; then \
echo " <a href=\"ftp://$${i}$${fpath}\">FTP</a>" >> $@; \
fi; \
echo "</small>" >> $@; \
fi; \
done
echo "</ul>" >> $@
......@@ -69,4 +77,7 @@ archive.mirrors: ../mirror/Mirrors.masterlist
done
echo "</ul>" >> $@
echo "</define-tag>" >> $@
.DELETE_ON_ERROR:
endif
......@@ -11,13 +11,11 @@ include $(WMLBASE)/Make.lang
books.$(LANGUAGE).html: books.wml $(ENGLISHSRCDIR)/doc/books.def \
$(TEMPLDIR)/countries.wml $(TEMPLDIR)/language_names.wml $(TEMPLDIR)/url.wml
ddp.$(LANGUAGE).html: ddp.wml $(TEMPLDIR)/ddp.wml
$(WML) -Dmlmonth=$(shell date '+%y%m') $(<F)
todo.$(LANGUAGE).html: todo.wml $(TEMPLDIR)/ddp.wml
docpolicy.$(LANGUAGE).html: docpolicy.wml $(TEMPLDIR)/ddp.wml
cvs.$(LANGUAGE).html: cvs.wml $(TEMPLDIR)/ddp.wml $(ENGLISHSRCDIR)/doc/dirtree.jpg
topics.$(LANGUAGE).html: topics.wml $(TEMPLDIR)/ddp.wml
user-manuals.$(LANGUAGE).html: user-manuals.wml $(TEMPLDIR)/ddp.wml $(ENGLISHSRCDIR)/doc/manuals.defs
admin-manuals.$(LANGUAGE).html: admin-manuals.wml $(TEMPLDIR)/ddp.wml \
$(ENGLISHSRCDIR)/doc/manuals.defs $(ENGLISHSRCDIR)/doc/admin-manuals.defs
user-manuals.$(LANGUAGE).html: user-manuals.wml $(TEMPLDIR)/ddp.wml \
$(ENGLISHSRCDIR)/doc/manuals.defs $(ENGLISHSRCDIR)/doc/version.defs
devel-manuals.$(LANGUAGE).html: devel-manuals.wml $(TEMPLDIR)/ddp.wml $(ENGLISHSRCDIR)/doc/manuals.defs
misc-manuals.$(LANGUAGE).html: misc-manuals.wml $(TEMPLDIR)/ddp.wml $(ENGLISHSRCDIR)/doc/manuals.defs
......@@ -16,7 +16,6 @@ ifeq "$(LANGUAGE)" "en"
# this stuff creates symlinks for releases
tes := $(shell grep current_testing_name info | cut -d\< -f2 | cut -d\> -f2)
rel := $(shell grep current_release_name info | cut -d\< -f2 | cut -d\> -f2)
fro := $(shell if grep frozen_release_exists=1 info; then grep current_frozen_name info | cut -d\< -f2 | cut -d\> -f2; fi)
install::
@if [ -d $(HTMLDIR)/hamm -a ! -L $(HTMLDIR)/2.0 ]; then ln -sv hamm $(HTMLDIR)/2.0; fi
......@@ -24,9 +23,5 @@ install::
@if [ -d $(HTMLDIR)/potato -a ! -L $(HTMLDIR)/2.2 ]; then ln -sv potato $(HTMLDIR)/2.2; fi
@[ -d "$(tes)" -a -d "$(rel)" ] || { echo "something's wrong with releases"; exit 1; }
@test -L $(HTMLDIR)/stable || ln -sv $(rel) $(HTMLDIR)/stable
ifneq "$(fro)" ""
@[ -d "$(fro)" ] || { echo "something's wrong with releases"; exit 1; }
@test -L $(HTMLDIR)/frozen || ln -sv $(fro) $(HTMLDIR)/frozen
endif
@test -L $(HTMLDIR)/testing || ln -sv $(tes) $(HTMLDIR)/testing
endif
......@@ -57,8 +57,11 @@ ifeq "$(LANGUAGE)" "en"
endif
ifeq "$(LANGUAGE)" "en"
install:: $(HTMLDIR)/keys.txt
install:: $(HTMLDIR)/keys.txt $(HTMLDIR)/dsa-rdf.css
$(HTMLDIR)/keys.txt: $(HTMLDIR)/%: %
install -m 664 -p $< $(HTMLDIR)
$(HTMLDIR)/dsa-rdf.css: $(HTMLDIR)/%: %
install -m 644 -p $< $(HTMLDIR)
endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment