more year end cleanups

CVS version numbers

arabic/Make.lang: 1.1 -> 1.2 
arabic/index.wml: 1.5 -> 1.6 
chinese/Make.lang: 1.11 -> 1.12 
chinese/index.wml: 1.24 -> 1.25 
chinese/News/Makefile: 1.2 -> 1.3 
chinese/News/index.wml: 1.3 -> 1.4 
croatian/Make.lang: 1.2 -> 1.3 
croatian/index.wml: 1.17 -> 1.18 
croatian/News/Makefile: 1.5 -> 1.6 
croatian/News/index.wml: 1.6 -> 1.7 
croatian/security/Makefile: 1.5 -> 1.6 
danish/Make.lang: 1.2 -> 1.3 
danish/index.wml: 1.2 -> 1.3 
english/index.wml: 1.49 -> 1.50 
english/News/Makefile: 1.14 -> 1.15 
english/News/index.wml: 1.9 -> 1.10 
english/security/Makefile: 1.22 -> 1.23 
esperanto/Make.lang: 1.1 -> 1.2 
esperanto/index.wml: 1.8 -> 1.9 
esperanto/News/Makefile: 1.1 -> 1.2 
esperanto/News/index.wml: 1.1 -> 1.2 
finnish/Make.lang: 1.1 -> 1.2 
finnish/index.wml: 1.7 -> 1.8 
finnish/News/Makefile: 1.1 -> 1.2 
finnish/News/index.wml: 1.1 -> 1.2 
finnish/security/Makefile: 1.3 -> 1.4 
french/Make.lang: 1.3 -> 1.4 
french/index.wml: 1.18 -> 1.19 
french/News/Makefile: 1.4 -> 1.5 
french/News/index.wml: 1.1 -> 1.2 
french/security/Makefile: 1.4 -> 1.5 
german/Make.lang: 1.4 -> 1.5 
german/index.wml: 1.12 -> 1.13 
german/News/Makefile: 1.6 -> 1.7 
german/News/index.wml: 1.5 -> 1.6 
german/security/Makefile: 1.4 -> 1.5 
hungarian/Make.lang: 1.1 -> 1.2 
hungarian/index.wml: 1.4 -> 1.5 
italian/Make.lang: 1.3 -> 1.4 
italian/index.wml: 1.10 -> 1.11 
italian/News/Makefile: 1.4 -> 1.5 
italian/security/Makefile: 1.8 -> 1.9 
japanese/Make.lang: 1.9 -> 1.10 
japanese/index.wml: 1.22 -> 1.23 
japanese/News/Makefile: 1.7 -> 1.8 
japanese/News/index.wml: 1.10 -> 1.11 
japanese/security/Makefile: 1.4 -> 1.5 
korean/Make.lang: 1.1 -> 1.2 
korean/index.wml: 1.11 -> 1.12 
korean/News/Makefile: 1.1 -> 1.2 
korean/News/index.wml: 1.1 -> 1.2 
korean/security/Makefile: 1.3 -> 1.4 
norwegian/Make.lang: 1.1 -> 1.2 
norwegian/News/Makefile: 1.1 -> 1.2 
norwegian/News/index.wml: 1.1 -> 1.2 
norwegian/security/Makefile: 1.3 -> 1.4 
polish/Make.lang: 1.3 -> 1.4 
polish/index.wml: 1.5 -> 1.6 
portuguese/Make.lang: 1.1 -> 1.2 
portuguese/index.wml: 1.2 -> 1.3 
romanian/Make.lang: 1.1 -> 1.2 
romanian/index.wml: 1.3 -> 1.4 
romanian/News/Makefile: 1.1 -> 1.2 
romanian/News/index.wml: 1.2 -> 1.3 
romanian/security/Makefile: 1.2 -> 1.3 
russian/Make.lang: 1.1 -> 1.2 
russian/index.wml: 1.3 -> 1.4 
russian/News/Makefile: 1.1 -> 1.2 
russian/News/index.wml: 1.3 -> 1.4 
spanish/Make.lang: 1.3 -> 1.4 
spanish/index.wml: 1.21 -> 1.22 
spanish/News/Makefile: 1.6 -> 1.7 
spanish/security/Makefile: 1.4 -> 1.5 
swedish/Make.lang: 1.1 -> 1.2 
swedish/index.wml: 1.15 -> 1.16 
swedish/News/Makefile: 1.3 -> 1.4 
swedish/News/index.wml: 1.3 -> 1.4 
swedish/security/Makefile: 1.3 -> 1.4 
turkish/Make.lang: 1.1 -> 1.2 
turkish/index.wml: 1.1 -> 1.2

1 files changed, 6 insertions, 5 deletions

diff --git a/norwegian/security/Makefile b/norwegian/security/Makefile
index 7a54cee2d32..8e6036caff1 100644
--- a/norwegian/security/Makefile
+++ b/norwegian/security/Makefile
@@ -4,9 +4,10 @@
 
 WMLBASE=..
 CUR_DIR=security
-# list any subdirectories in the following variable. Any directories listed
-# must exist or the make will not work
-SUBS=1997 1998 1999 2000 undated
+# list any subdirectories in the following variable. If a listed directory
+# exists, it must contain a Makefile, or make gives an error
+YEARS:=$(wildcard [12][0-9][0-9][0-9])
+SUBS=$(YEARS) undated
 
 include $(WMLBASE)/Make.lang
 include $(WMLBASE)/Make.common
@@ -14,8 +15,8 @@ include $(WMLBASE)/Make.common
 include $(WMLBASE)/Make.dep.templ    
 include $(WMLBASE)/Make.dep.generic
 
-index.$(LANGUAGE).html: index.wml $(wildcard 2000/2000*.wml) \
-     $(wildcard $(ENGLISHSRCDIR)/security/2000/2000*.wml) \
+index.$(LANGUAGE).html: index.wml $(wildcard $(CUR_YEAR)/$(CUR_YEAR)*.wml) \
+     $(wildcard $(ENGLISHSRCDIR)/security/$(CUR_YEAR)/$(CUR_YEAR)*.wml) \
           $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list.wml