diff options
| author | Cyril Brulebois <kibi@debian.org> | 2019-03-11 00:36:30 +0000 |
|---|---|---|
| committer | Cyril Brulebois <kibi@debian.org> | 2019-03-11 01:33:54 +0000 |
| commit | 35e5a08057ab8953dcfaceab9f623c52be7a44e4 (patch) | |
| tree | fe1626fe132cc5f38dc6c94269f2008fbca0381e | |
| parent | e0496a1974f81c11d576b507c2c2a1d39538d44e (diff) | |
Reduce entropy by sorting the output of all $(wildcard …) calls
Introducing a function (i.e. sorted_wildcard) seemed to make sense at
first but it would need to be defined in all Makefiles, before getting
used. That's why a “replace all occurrences” approach was preferred in
the end.
Many occurrences aren't going to make a difference anyway, because they
are about documenting target dependencies. But replacing everything
means it's easier to check later on, in case entropy comes back.
This file needs a slightly different diff because the Makefile snippet
is embedded in a Perl script: english/security/parse-advisory.pl
136 files changed, 402 insertions, 402 deletions
diff --git a/Makefile.common b/Makefile.common index cf45e560073..a01a8aef20e 100644 --- a/Makefile.common +++ b/Makefile.common @@ -52,7 +52,7 @@ WMLPROLOG := WMLEPILOG := WML = wml $(WMLOPTIONS) -o UNDEFu$(LANGUAGECAP):$(WMLOUTFILE)@g+w $(WMLPROLOG) $(WMLEPILOG) -WMLFILES = $(wildcard *.wml) +WMLFILES = $(sort $(wildcard *.wml)) ifndef SUBLANG HTMLFILES = $(patsubst %.wml,%.$(LANGUAGE).html,$(WMLFILES)) HTMLDESTFILES = $(patsubst %.wml,$(HTMLDIR)/%.$(LANGUAGE).html,$(WMLFILES)) @@ -63,11 +63,11 @@ HTMLDESTFILES = $(sort $(foreach i,$(SUBLANG),\ $(patsubst %.wml,$(HTMLDIR)/%.$(LANGUAGE)-$(i).html,$(WMLFILES)))) endif -OTHERFILES := $(wildcard *.ps.gz *.eps *.pdf *.css) -OTHERFILES += $(wildcard *.jpg *.jpeg *.gif *.png *.fig *.xcf *.xcf.gz *.ppm *.svg) +OTHERFILES := $(sort $(wildcard *.ps.gz *.eps *.pdf *.css)) +OTHERFILES += $(sort $(wildcard *.jpg *.jpeg *.gif *.png *.fig *.xcf *.xcf.gz *.ppm *.svg)) OTHERDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(OTHERFILES)) -existing-SUBS := $(shell for dir in $(wildcard $(SUBS)) ''; do test -d $$dir && echo $$dir; done) +existing-SUBS := $(shell for dir in $(sort $(wildcard $(SUBS))) ''; do test -d $$dir && echo $$dir; done) existing-SUBS-install := $(addsuffix -install,$(existing-SUBS)) existing-SUBS-clean := $(addsuffix -clean,$(existing-SUBS)) existing-SUBS-cleandest := $(addsuffix -cleandest,$(existing-SUBS)) @@ -146,7 +146,7 @@ ifeq "$(LANGUAGE)" "en" endif endif -LOCALEDESTFILES := $(patsubst $(ENGLISHDIR)/po/%.pot,$(LOCALEDIR)/%.mo,$(wildcard $(ENGLISHDIR)/po/*.pot)) +LOCALEDESTFILES := $(patsubst $(ENGLISHDIR)/po/%.pot,$(LOCALEDIR)/%.mo,$(sort $(wildcard $(ENGLISHDIR)/po/*.pot))) ifneq "$(LANGUAGE)" "en" # Ensure that MO files do exist diff --git a/bulgarian/releases/stretch/Makefile b/bulgarian/releases/stretch/Makefile index cce60161b39..34cd6fb504d 100644 --- a/bulgarian/releases/stretch/Makefile +++ b/bulgarian/releases/stretch/Makefile @@ -13,9 +13,9 @@ index.$(LANGUAGE).html: index.wml $(TEMPLDIR)/release.wml \ releasenotes.$(LANGUAGE).html: releasenotes.wml $(TEMPLDIR)/release.wml \ $(ENGLISHDIR)/releases/stretch/release.data $(TEMPLDIR)/release_info.wml \ $(ENGLISHDIR)/releases/arches.data \ - $(wildcard $(HTMLDIR)/*/release-notes*) + $(sort $(wildcard $(HTMLDIR)/*/release-notes*)) installmanual.$(LANGUAGE).html: installmanual.wml $(TEMPLDIR)/release.wml \ $(ENGLISHDIR)/releases/stretch/release.data $(TEMPLDIR)/release_info.wml \ $(ENGLISHDIR)/releases/arches.data \ - $(wildcard $(HTMLDIR)/*/install*) + $(sort $(wildcard $(HTMLDIR)/*/install*)) diff --git a/chinese/News/weekly/Makefile b/chinese/News/weekly/Makefile index 980a8f8307f..71814fae659 100644 --- a/chinese/News/weekly/Makefile +++ b/chinese/News/weekly/Makefile @@ -28,8 +28,8 @@ clean:: $(IGNORE)find . -type f -name \*.$(LANGUAGE)-??.html | xargs rm -f index.zh-cn.html index.zh-hk.html index.zh-tw.html: index.wml \ - $(wildcard $(CUR_YEAR)/*/index.wml) \ - $(wildcard $(ENGLISHSRCDIR)/News/weekly/$(CUR_YEAR)/*/index.wml) \ + $(sort $(wildcard $(CUR_YEAR)/*/index.wml)) \ + $(sort $(wildcard $(ENGLISHSRCDIR)/News/weekly/$(CUR_YEAR)/*/index.wml)) \ $(ENGLISHSRCDIR)/$(CUR_DIR)/CURRENT-ISSUE-IS \ $(TEMPLDIR)/weeklynews/header.wml \ $(TEMPLDIR)/weeklynews/index.wml \ @@ -37,8 +37,8 @@ index.zh-cn.html index.zh-hk.html index.zh-tw.html: index.wml \ [0-9]*/index.zh-cn.html [0-9]*/index.zh-hk.html [0-9]*/index.zh-tw.html: \ $(shell find $* -name index.wml) \ - $(wildcard 1999/*/index.wml) \ - $(wildcard $(ENGLISHSRCDIR)/News/weekly/$*/*/index.wml) \ + $(sort $(wildcard 1999/*/index.wml)) \ + $(sort $(wildcard $(ENGLISHSRCDIR)/News/weekly/$*/*/index.wml)) \ $(TEMPLDIR)/weeklynews/header.wml \ $(TEMPLDIR)/weeklynews/index.wml \ $(TEMPLDIR)/weeklynews/footer.wml $(GETTEXTDEP) diff --git a/english/CD/Makefile b/english/CD/Makefile index 125a811ee64..d8b7c7f0b04 100644 --- a/english/CD/Makefile +++ b/english/CD/Makefile @@ -23,7 +23,7 @@ endif %.$(LANGUAGE).html: %.wml $(EXTRAWMLDEP) | $(VCSREVCACHE) $(WML) $(<F) -ifneq "$(wildcard releases/index.wml)" "" +ifneq "$(sort $(wildcard releases/index.wml))" "" RELEASESDEP := releases/index.wml else RELEASESDEP := $(ENGLISHDIR)/CD/releases/index.wml diff --git a/english/MailingLists/Makefile b/english/MailingLists/Makefile index 6f25a8f95ab..05ecbde6102 100644 --- a/english/MailingLists/Makefile +++ b/english/MailingLists/Makefile @@ -30,7 +30,7 @@ lists.cfg := $(ENGLISHDIR)/$(CUR_DIR)/lists.cfg descfiles := $(shell find $(ENGLISHDIR)/$(CUR_DIR)/desc -type f \ ! -path '*/CVS/*' ! -name introduction \ ! -name subscription ! -name advertising ! -name README) -ifneq "$(wildcard desc)" "" +ifneq "$(sort $(wildcard desc))" "" descfiles := $(shell find desc -type f ! -path '*/CVS/*' ! -name introduction \ ! -name subscription ! -name advertising ! -name README) endif diff --git a/english/Makefile b/english/Makefile index 3c37fa529f2..f564365680f 100644 --- a/english/Makefile +++ b/english/Makefile @@ -29,9 +29,9 @@ DESTSEARCHXML = $(patsubst %.xml,$(HTMLDIR)/%.xml,$(SEARCHXML)) endif $(INDEXPAGE): index.wml $(TEMPLDIR)/mainpage.wml $(GETTEXTDEP) \ - $(wildcard News/$(CUR_YEAR)/[0-9]*.wml) $(wildcard $(ENGLISHSRCDIR)/News/$(CUR_YEAR)/[0-9]*.wml) \ - $(wildcard News/$(CUR_YEAR)/[0-9]*.title) \ - $(wildcard security/$(CUR_YEAR)/dsa-[0-9]*.wml) $(wildcard $(ENGLISHSRCDIR)/security/$(CUR_YEAR)/dsa-[0-9]*.wml) \ + $(sort $(wildcard News/$(CUR_YEAR)/[0-9]*.wml)) $(sort $(wildcard $(ENGLISHSRCDIR)/News/$(CUR_YEAR)/[0-9]*.wml)) \ + $(sort $(wildcard News/$(CUR_YEAR)/[0-9]*.title)) \ + $(sort $(wildcard security/$(CUR_YEAR)/dsa-[0-9]*.wml)) $(sort $(wildcard $(ENGLISHSRCDIR)/security/$(CUR_YEAR)/dsa-[0-9]*.wml)) \ $(TEMPLDIR)/ctime.wml $(TEMPLDIR)/recent_list.wml $(TEMPLDIR)/languages.wml \ $(TEMPLDIR)/release_info.wml $(TEMPLDIR)/release_images.wml ifeq "$(LANGUAGE)" "zh" diff --git a/english/News/Make.year b/english/News/Make.year index 43785f24816..4868e4166e9 100644 --- a/english/News/Make.year +++ b/english/News/Make.year @@ -14,8 +14,8 @@ include $(WMLBASE)/Make.lang # rebuild everything whenever it's updated - see # https://www.gnu.org/software/make/manual/html_node/Prerequisite-Types.html index.$(LANGUAGE).html: index.wml $(TEMPLDIR)/template.wml \ - $(TEMPLDIR)/recent_list.wml $(wildcard $(THIS_YEAR)*.wml) \ - $(wildcard $(ENGLISHDIR)/News/$(THIS_YEAR)/$(THIS_YEAR)*.wml) $(GETTEXTDEP) | $(VCSREVCACHE) + $(TEMPLDIR)/recent_list.wml $(sort $(wildcard $(THIS_YEAR)*.wml)) \ + $(sort $(wildcard $(ENGLISHDIR)/News/$(THIS_YEAR)/$(THIS_YEAR)*.wml)) $(GETTEXTDEP) | $(VCSREVCACHE) # Don't know why only these specific news articles are include # news_events.wml and not all of them... :-/ diff --git a/english/News/Makefile b/english/News/Makefile index c1a110776e9..e81e7bf6f2e 100644 --- a/english/News/Makefile +++ b/english/News/Makefile @@ -5,7 +5,7 @@ WMLBASE=.. CUR_DIR=News # 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]) +YEARS:=$(sort $(wildcard [12][0-9][0-9][0-9])) SUBS=$(YEARS) weekly press GETTEXTFILES += newsevents.mo @@ -24,8 +24,8 @@ DESTNEWSRDF := $(patsubst %.rdf,$(HTMLDIR)/%.rdf,$(NEWSRDF)) endif $(NEWSRDF): $(ENGLISHDIR)/News/news.rdf.in \ - $(wildcard $(CUR_YEAR)/*.wml) \ - $(wildcard $(ENGLISHDIR)/News/$(CUR_YEAR)/*.wml) \ + $(sort $(wildcard $(CUR_YEAR)/*.wml)) \ + $(sort $(wildcard $(ENGLISHDIR)/News/$(CUR_YEAR)/*.wml)) \ $(TEMPLDIR)/recent_list.wml $(GETTEXTDEP) ifeq "$(LANGUAGE)" "zh" $(shell echo $(WML) | perl -pe 's,:.zh-(..)\.html,:news.zh-$$1.rdf,g') \ @@ -45,9 +45,9 @@ $(DESTNEWSRDF): $(HTMLDIR)/%: % @test -d $(HTMLDIR) || mkdir -m g+w -p $(HTMLDIR) install -m 664 -p $< $(HTMLDIR) -index.$(LANGUAGE).html: index.wml $(wildcard $(CUR_YEAR)/$(CUR_YEAR)*.wml) \ - $(wildcard $(ENGLISHSRCDIR)/News/$(CUR_YEAR)/$(CUR_YEAR)*.wml) \ - $(wildcard $(CUR_YEAR)/$(CUR_YEAR)*.title) \ +index.$(LANGUAGE).html: index.wml $(sort $(wildcard $(CUR_YEAR)/$(CUR_YEAR)*.wml)) \ + $(sort $(wildcard $(ENGLISHSRCDIR)/News/$(CUR_YEAR)/$(CUR_YEAR)*.wml)) \ + $(sort $(wildcard $(CUR_YEAR)/$(CUR_YEAR)*.title)) \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list.wml \ $(TEMPLDIR)/languages.wml $(GETTEXTDEP) \ $(ENGLISHSRCDIR)/News/index.include diff --git a/english/News/weekly/Makefile b/english/News/weekly/Makefile index 98ef474d7ae..4ffb11fb226 100644 --- a/english/News/weekly/Makefile +++ b/english/News/weekly/Makefile @@ -81,8 +81,8 @@ clean:: $(IGNORE)find . -type f -name \*.$(LANGUAGE).html | xargs rm -f # Need to rebuild the index when anything changes. -index.$(LANGUAGE).html: index.wml $(wildcard $(CUR_YEAR)/*/index.wml) \ - $(wildcard $(ENGLISHSRCDIR)/News/weekly/$(CUR_YEAR)/*/index.wml) \ +index.$(LANGUAGE).html: index.wml $(sort $(wildcard $(CUR_YEAR)/*/index.wml)) \ + $(sort $(wildcard $(ENGLISHSRCDIR)/News/weekly/$(CUR_YEAR)/*/index.wml)) \ $(ENGLISHSRCDIR)/$(CUR_DIR)/CURRENT-ISSUE-IS \ $(TEMPLDIR)/projectnews/header.wml \ $(TEMPLDIR)/projectnews/index.wml \ @@ -95,7 +95,7 @@ index.$(LANGUAGE).html: index.wml $(wildcard $(CUR_YEAR)/*/index.wml) \ # this code works around a small bug in make's $(wildcard) function, too [0-9]*/index.$(LANGUAGE).html: %/index.$(LANGUAGE).html: \ $(shell find $* -name index.wml) \ - $(wildcard $(ENGLISHSRCDIR)/News/weekly/$*/*/index.wml) \ + $(sort $(wildcard $(ENGLISHSRCDIR)/News/weekly/$*/*/index.wml)) \ $(TEMPLDIR)/projectnews/header.wml \ $(TEMPLDIR)/projectnews/index.wml \ $(TEMPLDIR)/projectnews/footer.wml \ diff --git a/english/blends/hamradio/News/2014/Makefile b/english/blends/hamradio/News/2014/Makefile index 8085084817f..80eef90336e 100644 --- a/english/blends/hamradio/News/2014/Makefile +++ b/english/blends/hamradio/News/2014/Makefile @@ -13,8 +13,8 @@ include $(WMLBASE)/Make.lang # check that the prerequisite exists and is up to date, but don't # rebuild everything whenever it's updated - see # https://www.gnu.org/software/make/manual/html_node/Prerequisite-Types.html -index.$(LANGUAGE).html: index.wml $(wildcard 2014*.wml) \ - $(wildcard 2014*.title)\ +index.$(LANGUAGE).html: index.wml $(sort $(wildcard 2014*.wml)) \ + $(sort $(wildcard 2014*.title))\ $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list.wml | $(VCSREVCACHE) $(WML) index.wml %.$(LANGUAGE).html: %.wml $(TEMPLDIR)/news.wml | $(VCSREVCACHE) diff --git a/english/blends/hamradio/News/2015/Makefile b/english/blends/hamradio/News/2015/Makefile index f9cd9fa7e28..d6785f32e99 100644 --- a/english/blends/hamradio/News/2015/Makefile +++ b/english/blends/hamradio/News/2015/Makefile @@ -13,8 +13,8 @@ include $(WMLBASE)/Make.lang # check that the prerequisite exists and is up to date, but don't # rebuild everything whenever it's updated - see # https://www.gnu.org/software/make/manual/html_node/Prerequisite-Types.html -index.$(LANGUAGE).html: index.wml $(wildcard 2014*.wml) \ - $(wildcard 2014*.title)\ +index.$(LANGUAGE).html: index.wml $(sort $(wildcard 2014*.wml)) \ + $(sort $(wildcard 2014*.title))\ $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list.wml | $(VCSREVCACHE) $(WML) index.wml %.$(LANGUAGE).html: %.wml $(TEMPLDIR)/news.wml | $(VCSREVCACHE) diff --git a/english/blends/hamradio/News/Makefile b/english/blends/hamradio/News/Makefile index 8be05993a4b..184b58b3ea2 100644 --- a/english/blends/hamradio/News/Makefile +++ b/english/blends/hamradio/News/Makefile @@ -5,11 +5,11 @@ WMLBASE=../../.. CUR_DIR=blends/hamradio/News # 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]) +YEARS:=$(sort $(wildcard [12][0-9][0-9][0-9])) SUBS=$(YEARS) include $(WMLBASE)/Make.lang index.$(LANGUAGE).html: index.wml $(TEMPLDIR)/template.wml \ $(TEMPLDIR)/recent_list.wml \ - $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/[0-9]*/*.wml) + $(sort $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/[0-9]*/*.wml)) diff --git a/english/devel/debian-desktop/Makefile b/english/devel/debian-desktop/Makefile index daed459abf5..495a75631bb 100644 --- a/english/devel/debian-desktop/Makefile +++ b/english/devel/debian-desktop/Makefile @@ -8,5 +8,5 @@ SUBS=News include $(WMLBASE)/Make.lang index.$(LANGUAGE).html: index.wml $(TEMPLDIR)/template.wml \ - $(TEMPLDIR)/recent_list.wml $(wildcard News/[0-9]*/*.wml) \ - $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/News/[0-9]*/*.wml) + $(TEMPLDIR)/recent_list.wml $(sort $(wildcard News/[0-9]*/*.wml)) \ + $(sort $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/News/[0-9]*/*.wml)) diff --git a/english/devel/debian-installer/Makefile b/english/devel/debian-installer/Makefile index 302497cfb51..e1f7ccbcf66 100644 --- a/english/devel/debian-installer/Makefile +++ b/english/devel/debian-installer/Makefile @@ -8,8 +8,8 @@ SUBS=News include $(WMLBASE)/Make.lang index.$(LANGUAGE).html:: $(TEMPLDIR)/recent_list.wml \ - $(wildcard News/[12][0-9][0-9][0-9]/[0-9]*.wml) \ - $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/News/[12][0-9][0-9][0-9]/[0-9]*.wml) \ + $(sort $(wildcard News/[12][0-9][0-9][0-9]/[0-9]*.wml)) \ + $(sort $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/News/[12][0-9][0-9][0-9]/[0-9]*.wml)) \ $(ENGLISHSRCDIR)/$(CUR_DIR)/images.data \ $(TEMPLDIR)/release_info.wml $(GETTEXTDEP) diff --git a/english/devel/debian-installer/News/Make.year b/english/devel/debian-installer/News/Make.year index 4add7bcef3e..9e00e80b0c1 100644 --- a/english/devel/debian-installer/News/Make.year +++ b/english/devel/debian-installer/News/Make.year @@ -9,8 +9,8 @@ include $(WMLBASE)/Make.lang # check that the prerequisite exists and is up to date, but don't # rebuild everything whenever it's updated - see # https://www.gnu.org/software/make/manual/html_node/Prerequisite-Types.html -index.$(LANGUAGE).html: index.wml $(wildcard $(THIS_YEAR)*.wml) \ - $(wildcard $(THIS_YEAR)*.title) \ +index.$(LANGUAGE).html: index.wml $(sort $(wildcard $(THIS_YEAR)*.wml)) \ + $(sort $(wildcard $(THIS_YEAR)*.title)) \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list.wml \ $(GETTEXTDEP) | $(VCSREVCACHE) $(WML) index.wml diff --git a/english/devel/debian-installer/News/Makefile b/english/devel/debian-installer/News/Makefile index ef29c1ed43b..50c50a729c7 100644 --- a/english/devel/debian-installer/News/Makefile +++ b/english/devel/debian-installer/News/Makefile @@ -5,7 +5,7 @@ WMLBASE=../../.. CUR_DIR=devel/debian-installer/News # 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]) +YEARS:=$(sort $(wildcard [12][0-9][0-9][0-9])) SUBS=$(YEARS) include $(WMLBASE)/Make.lang @@ -13,5 +13,5 @@ include $(WMLBASE)/Make.lang index.$(LANGUAGE).html: index.wml $(TEMPLDIR)/template.wml \ $(TEMPLDIR)/recent_list.wml \ - $(wildcard [0-9]*/*.wml) \ - $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/[0-9]*/*.wml) + $(sort $(wildcard [0-9]*/*.wml)) \ + $(sort $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/[0-9]*/*.wml)) diff --git a/english/devel/debian-jr/Makefile b/english/devel/debian-jr/Makefile index e08ae7ab521..a6718ddfb6e 100644 --- a/english/devel/debian-jr/Makefile +++ b/english/devel/debian-jr/Makefile @@ -8,10 +8,10 @@ SUBS=News include $(WMLBASE)/Make.lang index.$(LANGUAGE).html: index.wml $(TEMPLDIR)/template.wml \ - $(TEMPLDIR)/recent_list.wml $(wildcard News/[0-9]*/*.wml) \ - $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/News/[0-9]*/*.wml) + $(TEMPLDIR)/recent_list.wml $(sort $(wildcard News/[0-9]*/*.wml)) \ + $(sort $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/News/[0-9]*/*.wml)) packaged.$(LANGUAGE).html: packaged.wml \ $(ENGLISHSRCDIR)/devel/debian-jr/packaged.tags \ - $(wildcard $(ENGLISHSRCDIR)/devel/debian-jr/packaged/*/*) \ - $(wildcard $(ENGLISHSRCDIR)/devel/debian-jr/packaged-non-free/*/*) + $(sort $(wildcard $(ENGLISHSRCDIR)/devel/debian-jr/packaged/*/*)) \ + $(sort $(wildcard $(ENGLISHSRCDIR)/devel/debian-jr/packaged-non-free/*/*)) diff --git a/english/devel/debian-jr/News/Make.year b/english/devel/debian-jr/News/Make.year index 9103debb3dd..bdc29f014ba 100644 --- a/english/devel/debian-jr/News/Make.year +++ b/english/devel/debian-jr/News/Make.year @@ -12,8 +12,8 @@ include $(WMLBASE)/Make.lang # check that the prerequisite exists and is up to date, but don't # rebuild everything whenever it's updated - see # https://www.gnu.org/software/make/manual/html_node/Prerequisite-Types.html -index.$(LANGUAGE).html: index.wml $(wildcard $(THIS_YEAR)*.wml) \ - $(wildcard $(THIS_YEAR)*.title)\ +index.$(LANGUAGE).html: index.wml $(sort $(wildcard $(THIS_YEAR)*.wml)) \ + $(sort $(wildcard $(THIS_YEAR)*.title))\ $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list.wml | $(VCSREVCACHE) $(WML) index.wml %.$(LANGUAGE).html: %.wml $(TEMPLDIR)/news.wml | $(VCSREVCACHE) diff --git a/english/devel/debian-jr/News/Makefile b/english/devel/debian-jr/News/Makefile index ca4b4cb18c9..8bce96ff6b9 100644 --- a/english/devel/debian-jr/News/Makefile +++ b/english/devel/debian-jr/News/Makefile @@ -5,7 +5,7 @@ WMLBASE=../../.. CUR_DIR=devel/debian-jr/News # 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]) +YEARS:=$(sort $(wildcard [12][0-9][0-9][0-9])) SUBS=$(YEARS) include $(WMLBASE)/Make.lang @@ -13,4 +13,4 @@ include $(WMLBASE)/Make.lang index.$(LANGUAGE).html: index.wml $(TEMPLDIR)/template.wml \ $(TEMPLDIR)/recent_list.wml \ - $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/[0-9]*/*.wml) + $(sort $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/[0-9]*/*.wml)) diff --git a/english/devel/debian-med/Makefile b/english/devel/debian-med/Makefile index 1a47cee6e7f..209f841e2bf 100644 --- a/english/devel/debian-med/Makefile +++ b/english/devel/debian-med/Makefile @@ -10,10 +10,10 @@ GETTEXTFILES = debian-cdd.mo include $(WMLBASE)/Make.lang index.$(LANGUAGE).html: index.wml $(TEMPLDIR)/template.wml $(GETTEXTDEP)\ - $(TEMPLDIR)/recent_list.wml $(wildcard News/[0-9]*/*.wml) \ - $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/News/[0-9]*/*.wml) + $(TEMPLDIR)/recent_list.wml $(sort $(wildcard News/[0-9]*/*.wml)) \ + $(sort $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/News/[0-9]*/*.wml)) #packaged.$(LANGUAGE).html: packaged.wml \ # $(ENGLISHSRCDIR)/devel/debian-med/packaged.tags \ -# $(wildcard $(ENGLISHSRCDIR)/devel/debian-med/packaged/*/*) \ -# $(wildcard $(ENGLISHSRCDIR)/devel/debian-med/packaged-non-free/*/*) +# $(sort $(wildcard $(ENGLISHSRCDIR)/devel/debian-med/packaged/*/*)) \ +# $(sort $(wildcard $(ENGLISHSRCDIR)/devel/debian-med/packaged-non-free/*/*)) diff --git a/english/devel/debian-med/News/Make.year b/english/devel/debian-med/News/Make.year index 89e22f91fbd..1f3f0ee8729 100644 --- a/english/devel/debian-med/News/Make.year +++ b/english/devel/debian-med/News/Make.year @@ -13,8 +13,8 @@ include $(WMLBASE)/Make.lang # check that the prerequisite exists and is up to date, but don't # rebuild everything whenever it's updated - see # https://www.gnu.org/software/make/manual/html_node/Prerequisite-Types.html -index.$(LANGUAGE).html: index.wml $(wildcard $(THIS_YEAR)*.wml) \ - $(wildcard $(THIS_YEAR)*.title)\ +index.$(LANGUAGE).html: index.wml $(sort $(wildcard $(THIS_YEAR)*.wml)) \ + $(sort $(wildcard $(THIS_YEAR)*.title))\ $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list.wml | $(VCSREVCACHE) $(WML) index.wml %.$(LANGUAGE).html: %.wml $(TEMPLDIR)/news.wml | $(VCSREVCACHE) diff --git a/english/devel/debian-med/News/Makefile b/english/devel/debian-med/News/Makefile index 40e1d9129a8..0c84243be8b 100644 --- a/english/devel/debian-med/News/Makefile +++ b/english/devel/debian-med/News/Makefile @@ -5,7 +5,7 @@ WMLBASE=../../.. CUR_DIR=devel/debian-med/News # 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]) +YEARS:=$(sort $(wildcard [12][0-9][0-9][0-9])) SUBS=$(YEARS) include $(WMLBASE)/Make.lang @@ -13,4 +13,4 @@ include $(WMLBASE)/Make.lang index.$(LANGUAGE).html: index.wml $(TEMPLDIR)/template.wml \ $(TEMPLDIR)/recent_list.wml \ - $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/[0-9]*/*.wml) + $(sort $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/[0-9]*/*.wml)) diff --git a/english/devel/debian-nonprofit/Makefile b/english/devel/debian-nonprofit/Makefile index 22bd29e9b08..88c82b1f72b 100644 --- a/english/devel/debian-nonprofit/Makefile +++ b/english/devel/debian-nonprofit/Makefile @@ -8,5 +8,5 @@ SUBS=News include $(WMLBASE)/Make.lang index.$(LANGUAGE).html: index.wml $(TEMPLDIR)/template.wml \ - $(TEMPLDIR)/recent_list.wml $(wildcard News/[0-9]*/*.wml) \ - $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/News/[0-9]*/*.wml) + $(TEMPLDIR)/recent_list.wml $(sort $(wildcard News/[0-9]*/*.wml)) \ + $(sort $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/News/[0-9]*/*.wml)) diff --git a/english/devel/debian-nonprofit/News/2003/Makefile b/english/devel/debian-nonprofit/News/2003/Makefile index 9bd34a398c1..822f15e4d5b 100644 --- a/english/devel/debian-nonprofit/News/2003/Makefile +++ b/english/devel/debian-nonprofit/News/2003/Makefile @@ -13,8 +13,8 @@ include $(WMLBASE)/Make.lang # check that the prerequisite exists and is up to date, but don't # rebuild everything whenever it's updated - see # https://www.gnu.org/software/make/manual/html_node/Prerequisite-Types.html -index.$(LANGUAGE).html: index.wml $(wildcard 2003*.wml) \ - $(wildcard 2003*.title)\ +index.$(LANGUAGE).html: index.wml $(sort $(wildcard 2003*.wml)) \ + $(sort $(wildcard 2003*.title))\ $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list.wml | $(VCSREVCACHE) $(WML) index.wml %.$(LANGUAGE).html: %.wml $(TEMPLDIR)/news.wml | $(VCSREVCACHE) diff --git a/english/devel/debian-nonprofit/News/2004/Makefile b/english/devel/debian-nonprofit/News/2004/Makefile index e1e0e877e5b..8f970f9c369 100644 --- a/english/devel/debian-nonprofit/News/2004/Makefile +++ b/english/devel/debian-nonprofit/News/2004/Makefile @@ -13,8 +13,8 @@ include $(WMLBASE)/Make.lang # check that the prerequisite exists and is up to date, but don't # rebuild everything whenever it's updated - see # https://www.gnu.org/software/make/manual/html_node/Prerequisite-Types.html -index.$(LANGUAGE).html: index.wml $(wildcard 2004*.wml) \ - $(wildcard 2004*.title)\ +index.$(LANGUAGE).html: index.wml $(sort $(wildcard 2004*.wml)) \ + $(sort $(wildcard 2004*.title))\ $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list.wml | $(VCSREVCACHE) $(WML) index.wml %.$(LANGUAGE).html: %.wml $(TEMPLDIR)/news.wml | $(VCSREVCACHE) diff --git a/english/devel/debian-nonprofit/News/Makefile b/english/devel/debian-nonprofit/News/Makefile index f6f5630d28b..00405c783be 100644 --- a/english/devel/debian-nonprofit/News/Makefile +++ b/english/devel/debian-nonprofit/News/Makefile @@ -5,7 +5,7 @@ WMLBASE=../../.. CUR_DIR=devel/debian-nonprofit/News # 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]) +YEARS:=$(sort $(wildcard [12][0-9][0-9][0-9])) SUBS=$(YEARS) include $(WMLBASE)/Make.lang @@ -13,4 +13,4 @@ include $(WMLBASE)/Make.lang index.$(LANGUAGE).html: index.wml $(TEMPLDIR)/template.wml \ $(TEMPLDIR)/recent_list.wml \ - $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/[0-9]*/*.wml) + $(sort $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/[0-9]*/*.wml)) diff --git a/english/events/1998/Makefile b/english/events/1998/Makefile index 710fd283543..1d0a6cf530c 100644 --- a/english/events/1998/Makefile +++ b/english/events/1998/Makefile @@ -14,7 +14,7 @@ include $(WMLBASE)/Make.lang # check that the prerequisite exists and is up to date, but don't # rebuild everything whenever it's updated - see # https://www.gnu.org/software/make/manual/html_node/Prerequisite-Types.html -index.$(LANGUAGE).html: index.wml $(wildcard [0-9]*\-*.wml) $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list.wml | $(VCSREVCACHE) +index.$(LANGUAGE).html: index.wml $(sort $(wildcard [0-9]*\-*.wml)) $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list.wml | $(VCSREVCACHE) $(WML) index.wml %.$(LANGUAGE).html: %.wml $(TEMPLDIR)/past_event.wml | $(VCSREVCACHE) diff --git a/english/events/1999/Makefile b/english/events/1999/Makefile index c5d20a75ee9..0e10dd193cc 100644 --- a/english/events/1999/Makefile +++ b/english/events/1999/Makefile @@ -14,7 +14,7 @@ include $(WMLBASE)/Make.lang # check that the prerequisite exists and is up to date, but don't # rebuild everything whenever it's updated - see # https://www.gnu.org/software/make/manual/html_node/Prerequisite-Types.html -index.$(LANGUAGE).html: index.wml $(wildcard [0-9]*\-*.wml) $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list.wml | $(VCSREVCACHE) +index.$(LANGUAGE).html: index.wml $(sort $(wildcard [0-9]*\-*.wml)) $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list.wml | $(VCSREVCACHE) $(WML) index.wml %.$(LANGUAGE).html: %.wml $(TEMPLDIR)/past_event.wml | $(VCSREVCACHE) diff --git a/english/events/2000/Makefile b/english/events/2000/Makefile index 3ac2e4c9676..5f8a82c8da9 100644 --- a/english/events/2000/Makefile +++ b/english/events/2000/Makefile @@ -14,7 +14,7 @@ include $(WMLBASE)/Make.lang # check that the prerequisite exists and is up to date, but don't # rebuild everything whenever it's updated - see # https://www.gnu.org/software/make/manual/html_node/Prerequisite-Types.html -index.$(LANGUAGE).html: index.wml $(wildcard [0-9]*\-*.wml) $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list.wml | $(VCSREVCACHE) +index.$(LANGUAGE).html: index.wml $(sort $(wildcard [0-9]*\-*.wml)) $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list.wml | $(VCSREVCACHE) %.$(LANGUAGE).html: %.wml $(TEMPLDIR)/past_event.wml | $(VCSREVCACHE) $(WML) $(<F) diff --git a/english/events/2001/Makefile b/english/events/2001/Makefile index b3a126d5231..63861ec06ff 100644 --- a/english/events/2001/Makefile +++ b/english/events/2001/Makefile @@ -14,7 +14,7 @@ include $(WMLBASE)/Make.lang # check that the prerequisite exists and is up to date, but don't # rebuild everything whenever it's updated - see # https://www.gnu.org/software/make/manual/html_node/Prerequisite-Types.html -index.$(LANGUAGE).html: index.wml $(wildcard [0-9]*\-*.wml) $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list.wml | $(VCSREVCACHE) +index.$(LANGUAGE).html: index.wml $(sort $(wildcard [0-9]*\-*.wml)) $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list.wml | $(VCSREVCACHE) %.$(LANGUAGE).html: %.wml $(TEMPLDIR)/event.wml | $(VCSREVCACHE) $(WML) $(<F) diff --git a/english/events/2002/Makefile b/english/events/2002/Makefile index 827b28015a7..e134b1da3fc 100644 --- a/english/events/2002/Makefile +++ b/english/events/2002/Makefile @@ -14,7 +14,7 @@ include $(WMLBASE)/Make.lang # check that the prerequisite exists and is up to date, but don't # rebuild everything whenever it's updated - see # https://www.gnu.org/software/make/manual/html_node/Prerequisite-Types.html -index.$(LANGUAGE).html: index.wml $(wildcard [0-9]*\-*.wml) $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list.wml | $(VCSREVCACHE) +index.$(LANGUAGE).html: index.wml $(sort $(wildcard [0-9]*\-*.wml)) $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list.wml | $(VCSREVCACHE) %.$(LANGUAGE).html: %.wml $(TEMPLDIR)/event.wml | $(VCSREVCACHE) $(WML) $(<F) diff --git a/english/events/2003/Makefile b/english/events/2003/Makefile index c61fcd8d601..6d68dbe7e07 100644 --- a/english/events/2003/Makefile +++ b/english/events/2003/Makefile @@ -10,7 +10,7 @@ GETTEXTFILES += newsevents.mo NOGENERICDEP := true include $(WMLBASE)/Make.lang -EVENTFILES := $(wildcard [0-9]*\-*.wml) +EVENTFILES := $(sort $(wildcard [0-9]*\-*.wml)) ICSFILES := $(filter-out %-report.wml,$(EVENTFILES)) ICSFILES := $(ICSFILES:.wml=.$(LANGUAGE).ics) DESTICSFILES := $(patsubst %.ics,$(HTMLDIR)/%.ics,$(ICSFILES)) @@ -26,7 +26,7 @@ clean:: # check that the prerequisite exists and is up to date, but don't # rebuild everything whenever it's updated - see # https://www.gnu.org/software/make/manual/html_node/Prerequisite-Types.html -index.$(LANGUAGE).html: index.wml $(wildcard [0-9]*\-*.wml) $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list.wml | $(VCSREVCACHE) +index.$(LANGUAGE).html: index.wml $(sort $(wildcard [0-9]*\-*.wml)) $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list.wml | $(VCSREVCACHE) %.$(LANGUAGE).html: %.wml $(TEMPLDIR)/event.wml | $(VCSREVCACHE) $(WML) $(<F) diff --git a/english/events/2004/Makefile b/english/events/2004/Makefile index 9f81aca0923..4fc0d7bd565 100644 --- a/english/events/2004/Makefile +++ b/english/events/2004/Makefile @@ -10,7 +10,7 @@ GETTEXTFILES += newsevents.mo NOGENERICDEP := true include $(WMLBASE)/Make.lang -EVENTFILES := $(wildcard [0-9]*\-*.wml) +EVENTFILES := $(sort $(wildcard [0-9]*\-*.wml)) ICSFILES := $(filter-out %-report.wml,$(EVENTFILES)) ICSFILES := $(ICSFILES:.wml=.$(LANGUAGE).ics) DESTICSFILES := $(patsubst %.ics,$(HTMLDIR)/%.ics,$(ICSFILES)) @@ -26,7 +26,7 @@ clean:: # check that the prerequisite exists and is up to date, but don't # rebuild everything whenever it's updated - see # https://www.gnu.org/software/make/manual/html_node/Prerequisite-Types.html -index.$(LANGUAGE).html: index.wml $(wildcard [0-9]*\-*.wml) $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list.wml | $(VCSREVCACHE) +index.$(LANGUAGE).html: index.wml $(sort $(wildcard [0-9]*\-*.wml)) $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list.wml | $(VCSREVCACHE) %.$(LANGUAGE).html: %.wml $(TEMPLDIR)/event.wml | $(VCSREVCACHE) $(WML) $(<F) diff --git a/english/events/2005/Makefile b/english/events/2005/Makefile index 37fa8bb18e1..c9b79089984 100644 --- a/english/events/2005/Makefile +++ b/english/events/2005/Makefile @@ -12,7 +12,7 @@ NOGENERICDEP := true include $(WMLBASE)/Make.lang -EVENTFILES := $(wildcard [0-9]*\-*.wml) +EVENTFILES := $(sort $(wildcard [0-9]*\-*.wml)) ICSFILES := $(filter-out %-report.wml,$(EVENTFILES)) ICSFILES := $(ICSFILES:.wml=.$(LANGUAGE).ics) DESTICSFILES := $(patsubst %.ics,$(HTMLDIR)/%.ics,$(ICSFILES)) @@ -28,7 +28,7 @@ clean:: # check that the prerequisite exists and is up to date, but don't # rebuild everything whenever it's updated - see # https://www.gnu.org/software/make/manual/html_node/Prerequisite-Types.html -index.$(LANGUAGE).html: index.wml $(wildcard [0-9]*\-*.wml) $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list.wml | $(VCSREVCACHE) +index.$(LANGUAGE).html: index.wml $(sort $(wildcard [0-9]*\-*.wml)) $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list.wml | $(VCSREVCACHE) %.$(LANGUAGE).html: %.wml $(TEMPLDIR)/event.wml | $(VCSREVCACHE) $(WML) $(<F) diff --git a/english/events/2006/Makefile b/english/events/2006/Makefile index 3d491917465..37c23811bbc 100644 --- a/english/events/2006/Makefile +++ b/english/events/2006/Makefile @@ -10,7 +10,7 @@ GETTEXTFILES += newsevents.mo NOGENERICDEP := true include $(WMLBASE)/Make.lang -EVENTFILES := $(wildcard [0-9]*\-*.wml) +EVENTFILES := $(sort $(wildcard [0-9]*\-*.wml)) ICSFILES := $(filter-out %-report.wml,$(EVENTFILES)) ICSFILES := $(ICSFILES:.wml=.$(LANGUAGE).ics) DESTICSFILES := $(patsubst %.ics,$(HTMLDIR)/%.ics,$(ICSFILES)) @@ -26,7 +26,7 @@ clean:: # check that the prerequisite exists and is up to date, but don't # rebuild everything whenever it's updated - see # https://www.gnu.org/software/make/manual/html_node/Prerequisite-Types.html -index.$(LANGUAGE).html: index.wml $(wildcard [0-9]*\-*.wml) $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list.wml | $(VCSREVCACHE) +index.$(LANGUAGE).html: index.wml $(sort $(wildcard [0-9]*\-*.wml)) $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list.wml | $(VCSREVCACHE) %.$(LANGUAGE).html: %.wml $(TEMPLDIR)/event.wml | $(VCSREVCACHE) $(WML) $(<F) diff --git a/english/events/2007/Makefile b/english/events/2007/Makefile index 3c4a0a736db..87af57d48c8 100644 --- a/english/events/2007/Makefile +++ b/english/events/2007/Makefile @@ -10,7 +10,7 @@ GETTEXTFILES += newsevents.mo NOGENERICDEP := true include $(WMLBASE)/Make.lang -EVENTFILES := $(wildcard [0-9]*\-*.wml) +EVENTFILES := $(sort $(wildcard [0-9]*\-*.wml)) ICSFILES := $(filter-out %-report.wml,$(EVENTFILES)) ICSFILES := $(ICSFILES:.wml=.$(LANGUAGE).ics) DESTICSFILES := $(patsubst %.ics,$(HTMLDIR)/%.ics,$(ICSFILES)) @@ -26,7 +26,7 @@ clean:: # check that the prerequisite exists and is up to date, but don't # rebuild everything whenever it's updated - see # https://www.gnu.org/software/make/manual/html_node/Prerequisite-Types.html -index.$(LANGUAGE).html: index.wml $(wildcard [0-9]*\-*.wml) $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list.wml | $(VCSREVCACHE) +index.$(LANGUAGE).html: index.wml $(sort $(wildcard [0-9]*\-*.wml)) $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list.wml | $(VCSREVCACHE) %.$(LANGUAGE).html: %.wml $(TEMPLDIR)/event.wml | $(VCSREVCACHE) $(WML) $(<F) diff --git a/english/events/2008/Makefile b/english/events/2008/Makefile index 3063123344e..004f26e8b8c 100644 --- a/english/events/2008/Makefile +++ b/english/events/2008/Makefile @@ -10,7 +10,7 @@ GETTEXTFILES += newsevents.mo NOGENERICDEP := true include $(WMLBASE)/Make.lang -EVENTFILES := $(wildcard [0-9]*\-*.wml) +EVENTFILES := $(sort $(wildcard [0-9]*\-*.wml)) ICSFILES := $(filter-out %-report.wml,$(EVENTFILES)) ICSFILES := $(ICSFILES:.wml=.$(LANGUAGE).ics) DESTICSFILES := $(patsubst %.ics,$(HTMLDIR)/%.ics,$(ICSFILES)) @@ -26,7 +26,7 @@ clean:: # check that the prerequisite exists and is up to date, but don't # rebuild everything whenever it's updated - see # https://www.gnu.org/software/make/manual/html_node/Prerequisite-Types.html -index.$(LANGUAGE).html: index.wml $(wildcard [0-9]*\-*.wml) $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list.wml | $(VCSREVCACHE) +index.$(LANGUAGE).html: index.wml $(sort $(wildcard [0-9]*\-*.wml)) $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list.wml | $(VCSREVCACHE) %.$(LANGUAGE).html: %.wml $(TEMPLDIR)/event.wml | $(VCSREVCACHE) $(WML) $(<F) diff --git a/english/events/2009/Makefile b/english/events/2009/Makefile index e47d73b650e..27fb7262cab 100644 --- a/english/events/2009/Makefile +++ b/english/events/2009/Makefile @@ -10,7 +10,7 @@ GETTEXTFILES += newsevents.mo NOGENERICDEP := true include $(WMLBASE)/Make.lang -EVENTFILES := $(wildcard [0-9]*\-*.wml) +EVENTFILES := $(sort $(wildcard [0-9]*\-*.wml)) ICSFILES := $(filter-out %-report.wml,$(EVENTFILES)) ICSFILES := $(ICSFILES:.wml=.$(LANGUAGE).ics) DESTICSFILES := $(patsubst %.ics,$(HTMLDIR)/%.ics,$(ICSFILES)) @@ -26,7 +26,7 @@ clean:: # check that the prerequisite exists and is up to date, but don't # rebuild everything whenever it's updated - see # https://www.gnu.org/software/make/manual/html_node/Prerequisite-Types.html -index.$(LANGUAGE).html: index.wml $(wildcard [0-9]*\-*.wml) $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list.wml | $(VCSREVCACHE) +index.$(LANGUAGE).html: index.wml $(sort $(wildcard [0-9]*\-*.wml)) $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list.wml | $(VCSREVCACHE) %.$(LANGUAGE).html: %.wml $(TEMPLDIR)/event.wml | $(VCSREVCACHE) $(WML) $(<F) diff --git a/english/events/2010/Makefile b/english/events/2010/Makefile index d33cc1f3333..79669734984 100644 --- a/english/events/2010/Makefile +++ b/english/events/2010/Makefile @@ -10,7 +10,7 @@ GETTEXTFILES += newsevents.mo NOGENERICDEP := true include $(WMLBASE)/Make.lang -EVENTFILES := $(wildcard [0-9]*\-*.wml) +EVENTFILES := $(sort $(wildcard [0-9]*\-*.wml)) ICSFILES := $(filter-out %-report.wml,$(EVENTFILES)) ICSFILES := $(ICSFILES:.wml=.$(LANGUAGE).ics) DESTICSFILES := $(patsubst %.ics,$(HTMLDIR)/%.ics,$(ICSFILES)) @@ -26,7 +26,7 @@ clean:: # check that the prerequisite exists and is up to date, but don't # rebuild everything whenever it's updated - see # https://www.gnu.org/software/make/manual/html_node/Prerequisite-Types.html -index.$(LANGUAGE).html: index.wml $(wildcard [0-9]*\-*.wml) $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list.wml | $(VCSREVCACHE) +index.$(LANGUAGE).html: index.wml $(sort $(wildcard [0-9]*\-*.wml)) $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list.wml | $(VCSREVCACHE) %.$(LANGUAGE).html: %.wml $(TEMPLDIR)/event.wml | $(VCSREVCACHE) $(WML) $(<F) diff --git a/english/events/2011/Makefile b/english/events/2011/Makefile index ae714d76d64..f22275b9668 100644 --- a/english/events/2011/Makefile +++ b/english/events/2011/Makefile @@ -10,7 +10,7 @@ GETTEXTFILES += newsevents.mo NOGENERICDEP := true include $(WMLBASE)/Make.lang -EVENTFILES := $(wildcard [0-9]*\-*.wml) +EVENTFILES := $(sort $(wildcard [0-9]*\-*.wml)) ICSFILES := $(filter-out %-report.wml,$(EVENTFILES)) ICSFILES := $(ICSFILES:.wml=.$(LANGUAGE).ics) DESTICSFILES := $(patsubst %.ics,$(HTMLDIR)/%.ics,$(ICSFILES)) @@ -26,7 +26,7 @@ clean:: # check that the prerequisite exists and is up to date, but don't # rebuild everything whenever it's updated - see # https://www.gnu.org/software/make/manual/html_node/Prerequisite-Types.html -index.$(LANGUAGE).html: index.wml $(wildcard [0-9]*\-*.wml) $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list.wml | $(VCSREVCACHE) +index.$(LANGUAGE).html: index.wml $(sort $(wildcard [0-9]*\-*.wml)) $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list.wml | $(VCSREVCACHE) %.$(LANGUAGE).html: %.wml $(TEMPLDIR)/event.wml | $(VCSREVCACHE) $(WML) $(<F) diff --git a/english/events/2012/Makefile b/english/events/2012/Makefile index 48f08de4cf3..6dee2515331 100644 --- a/english/events/2012/Makefile +++ b/english/events/2012/Makefile @@ -10,7 +10,7 @@ GETTEXTFILES += newsevents.mo NOGENERICDEP := true include $(WMLBASE)/Make.lang -EVENTFILES := $(wildcard [0-9]*\-*.wml) +EVENTFILES := $(sort $(wildcard [0-9]*\-*.wml)) ICSFILES := $(filter-out %-report.wml,$(EVENTFILES)) ICSFILES := $(ICSFILES:.wml=.$(LANGUAGE).ics) DESTICSFILES := $(patsubst %.ics,$(HTMLDIR)/%.ics,$(ICSFILES)) @@ -26,7 +26,7 @@ clean:: # check that the prerequisite exists and is up to date, but don't # rebuild everything whenever it's updated - see # https://www.gnu.org/software/make/manual/html_node/Prerequisite-Types.html -index.$(LANGUAGE).html: index.wml $(wildcard [0-9]*\-*.wml) $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list.wml | $(VCSREVCACHE) +index.$(LANGUAGE).html: index.wml $(sort $(wildcard [0-9]*\-*.wml)) $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list.wml | $(VCSREVCACHE) %.$(LANGUAGE).html: %.wml $(TEMPLDIR)/event.wml | $(VCSREVCACHE) $(WML) $(<F) diff --git a/english/events/2013/Makefile b/english/events/2013/Makefile index 55afb2eac7d..0c5d83fe991 100644 --- a/english/events/2013/Makefile +++ b/english/events/2013/Makefile @@ -10,7 +10,7 @@ GETTEXTFILES += newsevents.mo NOGENERICDEP := true include $(WMLBASE)/Make.lang -EVENTFILES := $(wildcard [0-9]*\-*.wml) +EVENTFILES := $(sort $(wildcard [0-9]*\-*.wml)) ICSFILES := $(filter-out %-report.wml,$(EVENTFILES)) ICSFILES := $(ICSFILES:.wml=.$(LANGUAGE).ics) DESTICSFILES := $(patsubst %.ics,$(HTMLDIR)/%.ics,$(ICSFILES)) @@ -26,8 +26,8 @@ clean:: # check that the prerequisite exists and is up to date, but don't # rebuild everything whenever it's updated - see # https://www.gnu.org/software/make/manual/html_node/Prerequisite-Types.html -index.$(LANGUAGE).html: index.wml $(wildcard [0-9]*\-*.wml) \ - $(wildcard $(ENGLISHDIR)/events/2013/[0-9]*\-*.wml) \ +index.$(LANGUAGE).html: index.wml $(sort $(wildcard [0-9]*\-*.wml)) \ + $(sort $(wildcard $(ENGLISHDIR)/events/2013/[0-9]*\-*.wml)) \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list.wml | $(VCSREVCACHE) %.$(LANGUAGE).html: %.wml $(TEMPLDIR)/event.wml | $(VCSREVCACHE) diff --git a/english/events/Makefile b/english/events/Makefile index 06193f9efad..d9bca9eea7d 100644 --- a/english/events/Makefile +++ b/english/events/Makefile @@ -3,7 +3,7 @@ WMLBASE=.. CUR_DIR=events -YEARS=$(wildcard [12][0-9][0-9][0-9]) +YEARS=$(sort $(wildcard [12][0-9][0-9][0-9])) SUBS=$(YEARS) weekly press speakers # note: the materials/ subdirectory isn't in CVS. @@ -11,9 +11,9 @@ GETTEXTFILES += newsevents.mo include $(WMLBASE)/Make.lang -index.$(LANGUAGE).html: index.wml $(wildcard [0-9]*/*.wml) \ +index.$(LANGUAGE).html: index.wml $(sort $(wildcard [0-9]*/*.wml)) \ $(ENGLISHSRCDIR)/events/index.include \ - $(wildcard $(ENGLISHSRCDIR)/events/[0-9]*/*.wml) \ + $(sort $(wildcard $(ENGLISHSRCDIR)/events/[0-9]*/*.wml)) \ $(TEMPLDIR)/footer.wml $(TEMPLDIR)/languages.wml talks.$(LANGUAGE).html: index.wml $(ENGLISHSRCDIR)/events/talks.data \ diff --git a/english/international/l10n/po/Makefile b/english/international/l10n/po/Makefile index 92165ca933c..cc2bae4c3bb 100644 --- a/english/international/l10n/po/Makefile +++ b/english/international/l10n/po/Makefile @@ -18,7 +18,7 @@ HTML_PO := $(foreach lang,$(LANGS_PO),$(lang).$(LANGUAGE).html) all:: $(HTML_PO) -WEAK_FAILURES = $(wildcard *.wml) +WEAK_FAILURES = $(sort $(wildcard *.wml)) tmpl.$(LANGUAGE).tmpl: tmpl.src $(L10N_DIR)/dtc.def $(ENGLISHDIR)/$(CUR_DIR)/menu.inc $(L10N_DIR)/date.gen $(GETTEXTDEP) $(WML) tmpl.src diff --git a/english/lts/security/2014/Makefile b/english/lts/security/2014/Makefile index 7da8b553e0d..4ce34b172b1 100644 --- a/english/lts/security/2014/Makefile +++ b/english/lts/security/2014/Makefile @@ -20,6 +20,6 @@ include $(WMLBASE)/Make.lang $(WML) $(<F) index.$(LANGUAGE).html: index.wml \ - $(wildcard dla-[0-9]*.wml) $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/dla-[0-9]*.data) \ + $(sort $(wildcard dla-[0-9]*.wml)) $(sort $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/dla-[0-9]*.data)) \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list_security.wml $(GETTEXTDEP) | $(VCSREVCACHE) $(WML) $(<F) diff --git a/english/lts/security/2015/Makefile b/english/lts/security/2015/Makefile index a00063b0c39..99c2c3cf430 100644 --- a/english/lts/security/2015/Makefile +++ b/english/lts/security/2015/Makefile @@ -20,6 +20,6 @@ include $(WMLBASE)/Make.lang $(WML) $(<F) index.$(LANGUAGE).html: index.wml \ - $(wildcard dla-[0-9]*.wml) $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/dla-[0-9]*.data) \ + $(sort $(wildcard dla-[0-9]*.wml)) $(sort $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/dla-[0-9]*.data)) \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list_security.wml $(GETTEXTDEP) | $(VCSREVCACHE) $(WML) $(<F) diff --git a/english/lts/security/2016/Makefile b/english/lts/security/2016/Makefile index 4179104b293..9f3feab7c22 100644 --- a/english/lts/security/2016/Makefile +++ b/english/lts/security/2016/Makefile @@ -20,6 +20,6 @@ include $(WMLBASE)/Make.lang $(WML) $(<F) index.$(LANGUAGE).html: index.wml \ - $(wildcard dla-[0-9]*.wml) $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/dla-[0-9]*.data) \ + $(sort $(wildcard dla-[0-9]*.wml)) $(sort $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/dla-[0-9]*.data)) \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list_security.wml $(GETTEXTDEP) | $(VCSREVCACHE) $(WML) $(<F) diff --git a/english/lts/security/2017/Makefile b/english/lts/security/2017/Makefile index 7b3d527c49c..b890e4fdd41 100644 --- a/english/lts/security/2017/Makefile +++ b/english/lts/security/2017/Makefile @@ -18,7 +18,7 @@ INDEXPAGE = $(sort $(foreach i,$(SUBLANG),$(subst index,index.$(LANGUAGE)-$(i),i endif $(INDEXPAGE): index.wml \ - $(wildcard dla-[0-9]*.wml) $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/dla-[0-9]*.data) \ + $(sort $(wildcard dla-[0-9]*.wml)) $(sort $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/dla-[0-9]*.data)) \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list_security.wml $(GETTEXTDEP) | $(VCSREVCACHE) ifeq "$(LANGUAGE)" "zh" @echo -n "Processing $(<F): " diff --git a/english/lts/security/2018/Makefile b/english/lts/security/2018/Makefile index d572dfc2be7..01440ef2679 100644 --- a/english/lts/security/2018/Makefile +++ b/english/lts/security/2018/Makefile @@ -22,7 +22,7 @@ endif # rebuild everything whenever it's updated - see # https://www.gnu.org/software/make/manual/html_node/Prerequisite-Types.html $(INDEXPAGE): index.wml \ - $(wildcard dla-[0-9]*.wml) $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/dla-[0-9]*.data) \ + $(sort $(wildcard dla-[0-9]*.wml)) $(sort $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/dla-[0-9]*.data)) \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list_security.wml $(GETTEXTDEP) | $(VCSREVCACHE) ifeq "$(LANGUAGE)" "zh" @echo -n "Processing $(<F): " diff --git a/english/lts/security/2019/Makefile b/english/lts/security/2019/Makefile index 360a01352ca..7e767552a4e 100644 --- a/english/lts/security/2019/Makefile +++ b/english/lts/security/2019/Makefile @@ -22,7 +22,7 @@ endif # rebuild everything whenever it's updated - see # https://www.gnu.org/software/make/manual/html_node/Prerequisite-Types.html $(INDEXPAGE): index.wml \ - $(wildcard dla-[0-9]*.wml) $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/dla-[0-9]*.data) \ + $(sort $(wildcard dla-[0-9]*.wml)) $(sort $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/dla-[0-9]*.data)) \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list_security.wml $(GETTEXTDEP) | $(VCSREVCACHE) ifeq "$(LANGUAGE)" "zh" @echo -n "Processing $(<F): " diff --git a/english/lts/security/Makefile b/english/lts/security/Makefile index 6ccd3556d8b..40f29dd09ab 100644 --- a/english/lts/security/Makefile +++ b/english/lts/security/Makefile @@ -3,7 +3,7 @@ WMLBASE=../.. CUR_DIR=lts/security -SUBS= $(wildcard 2[0-9][0-9][0-9]) +SUBS= $(sort $(wildcard 2[0-9][0-9][0-9])) GETTEXTFILES += security.mo @@ -26,12 +26,12 @@ DESTDLALONGRDF := $(patsubst %.rdf,$(HTMLDIR)/%.rdf,$(DLALONGRDF)) endif -$(INDEXPAGE): index.wml $(wildcard $(CUR_YEAR)/dla-*.wml) \ - $(wildcard $(CUR_YEAR)/dla-*.wml) \ - $(wildcard $(ENGLISHSRCDIR)/lts/security/$(CUR_YEAR)/dla-*.wml) \ - $(wildcard $(ENGLISHSRCDIR)/lts/security/$(CUR_YEAR)/dla-*.data) \ - $(wildcard $(ENGLISHSRCDIR)/lts/security/$(CUR_YEAR)/dla-*.wml) \ - $(wildcard $(ENGLISHSRCDIR)/lts/security/$(CUR_YEAR)/dla-*.data) \ +$(INDEXPAGE): index.wml $(sort $(wildcard $(CUR_YEAR)/dla-*.wml)) \ + $(sort $(wildcard $(CUR_YEAR)/dla-*.wml)) \ + $(sort $(wildcard $(ENGLISHSRCDIR)/lts/security/$(CUR_YEAR)/dla-*.wml)) \ + $(sort $(wildcard $(ENGLISHSRCDIR)/lts/security/$(CUR_YEAR)/dla-*.data)) \ + $(sort $(wildcard $(ENGLISHSRCDIR)/lts/security/$(CUR_YEAR)/dla-*.wml)) \ + $(sort $(wildcard $(ENGLISHSRCDIR)/lts/security/$(CUR_YEAR)/dla-*.data)) \ $(TEMPLDIR)/release_info.wml \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list_security.wml $(GETTEXTDEP) @@ -46,7 +46,7 @@ else endif -$(ENGLISHSRCDIR)/lts/security/ref-table.inc: $(ENGLISHSRCDIR)/lts/security/make-ref-table.pl $(wildcard $(ENGLISHSRCDIR)/lts/security/*/*.data) +$(ENGLISHSRCDIR)/lts/security/ref-table.inc: $(ENGLISHSRCDIR)/lts/security/make-ref-table.pl $(sort $(wildcard $(ENGLISHSRCDIR)/lts/security/*/*.data)) perl $(ENGLISHSRCDIR)/lts/security/make-ref-table.pl -p -a >$(ENGLISHSRCDIR)/lts/security/ref-table.inc crossreferences.$(LANGUAGE).html:: $(ENGLISHSRCDIR)/lts/security/ref-table.inc \ @@ -57,12 +57,12 @@ clean:: rm -f ref-table.inc $(DLARDF): $(ENGLISHDIR)/lts/security/dla.rdf.in \ - $(wildcard $(CUR_YEAR)/dla-*.wml) \ - $(wildcard $(ENGLISHDIR)/lts/security/$(CUR_YEAR)/dla-*.wml) \ - $(wildcard $(ENGLISHDIR)/lts/security/$(CUR_YEAR)/dla-*.data) \ - $(wildcard $(CUR_YEAR)/dla-*.wml) \ - $(wildcard $(ENGLISHDIR)/lts/security/$(CUR_YEAR)/dla-*.wml) \ - $(wildcard $(ENGLISHDIR)/lts/security/$(CUR_YEAR)/dla-*.data) \ + $(sort $(wildcard $(CUR_YEAR)/dla-*.wml)) \ + $(sort $(wildcard $(ENGLISHDIR)/lts/security/$(CUR_YEAR)/dla-*.wml)) \ + $(sort $(wildcard $(ENGLISHDIR)/lts/security/$(CUR_YEAR)/dla-*.data)) \ + $(sort $(wildcard $(CUR_YEAR)/dla-*.wml)) \ + $(sort $(wildcard $(ENGLISHDIR)/lts/security/$(CUR_YEAR)/dla-*.wml)) \ + $(sort $(wildcard $(ENGLISHDIR)/lts/security/$(CUR_YEAR)/dla-*.data)) \ $(TEMPLDIR)/recent_list_security.wml $(GETTEXTDEP) ifeq "$(LANGUAGE)" "zh" @echo -n "Processing $(<F): " @@ -76,12 +76,12 @@ else endif $(DLALONGRDF): $(ENGLISHDIR)/lts/security/dla-long.rdf.in \ - $(wildcard $(CUR_YEAR)/dla-*.wml) \ - $(wildcard $(ENGLISHDIR)/lts/security/$(CUR_YEAR)/dla-*.wml) \ - $(wildcard $(ENGLISHDIR)/lts/security/$(CUR_YEAR)/dla-*.data) \ - $(wildcard $(CUR_YEAR)/dla-*.wml) \ - $(wildcard $(ENGLISHDIR)/lts/security/$(CUR_YEAR)/dla-*.wml) \ - $(wildcard $(ENGLISHDIR)/lts/security/$(CUR_YEAR)/dla-*.data) \ + $(sort $(wildcard $(CUR_YEAR)/dla-*.wml)) \ + $(sort $(wildcard $(ENGLISHDIR)/lts/security/$(CUR_YEAR)/dla-*.wml)) \ + $(sort $(wildcard $(ENGLISHDIR)/lts/security/$(CUR_YEAR)/dla-*.data)) \ + $(sort $(wildcard $(CUR_YEAR)/dla-*.wml)) \ + $(sort $(wildcard $(ENGLISHDIR)/lts/security/$(CUR_YEAR)/dla-*.wml)) \ + $(sort $(wildcard $(ENGLISHDIR)/lts/security/$(CUR_YEAR)/dla-*.data)) \ $(TEMPLDIR)/recent_list_security.wml $(GETTEXTDEP) ifeq "$(LANGUAGE)" "zh" @echo -n "Processing $(<F): " @@ -95,9 +95,9 @@ else endif $(DLAALLRDF): $(ENGLISHDIR)/lts/security/dla-all.rdf.in \ - $(wildcard ????/dla-*.wml) \ - $(wildcard $(ENGLISHDIR)/lts/security/????/dla-*.wml) \ - $(wildcard $(ENGLISHDIR)/lts/security/????/dla-*.data) \ + $(sort $(wildcard ????/dla-*.wml)) \ + $(sort $(wildcard $(ENGLISHDIR)/lts/security/????/dla-*.wml)) \ + $(sort $(wildcard $(ENGLISHDIR)/lts/security/????/dla-*.data)) \ $(TEMPLDIR)/recent_list.wml $(GETTEXTDEP) ifeq "$(LANGUAGE)" "zh" @echo -n "Processing $(<F): " @@ -127,7 +127,7 @@ ifeq "$(LANGUAGE)" "en" map := $(HTMLDIR)/map-dla.txt -$(map): $(wildcard $(CUR_YEAR)/dla-*.wml) +$(map): $(sort $(wildcard $(CUR_YEAR)/dla-*.wml)) for i in 2*/dla-*.wml; do echo $$i $$i | sed -r 's/^.+\/(.+) /\1 /' | sed 's/\.wml//g' | sed 's/^dla-//' ;done > $(HTMLDIR)/map-dla.txt install:: $(map) diff --git a/english/partners/Makefile b/english/partners/Makefile index 521a801e7ce..0a80facc3fe 100644 --- a/english/partners/Makefile +++ b/english/partners/Makefile @@ -6,15 +6,15 @@ CUR_DIR=partners GETTEXTFILES += partners.mo # 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]) +YEARS:=$(sort $(wildcard [12][0-9][0-9][0-9])) SUBS=$(YEARS) images include $(WMLBASE)/Make.lang -index.$(LANGUAGE).html: index.wml $(wildcard $(CUR_YEAR)/index.wml) \ - $(wildcard $(ENGLISHSRCDIR)/partners/$(CUR_YEAR)/index.wml) \ - $(wildcard $(ENGLISHSRCDIR)/partners/$(CUR_YEAR)/images) \ - $(wildcard $(ENGLISHSRCDIR)/partners/$(CUR_YEAR)/partners.data) \ +index.$(LANGUAGE).html: index.wml $(sort $(wildcard $(CUR_YEAR)/index.wml)) \ + $(sort $(wildcard $(ENGLISHSRCDIR)/partners/$(CUR_YEAR)/index.wml)) \ + $(sort $(wildcard $(ENGLISHSRCDIR)/partners/$(CUR_YEAR)/images)) \ + $(sort $(wildcard $(ENGLISHSRCDIR)/partners/$(CUR_YEAR)/partners.data)) \ $(TEMPLDIR)/template.wml \ $(ENGLISHSRCDIR)/partners/index.include \ $(ENGLISHSRCDIR)/partners/partners.def $(GETTEXTDEP) diff --git a/english/ports/powerpc/inst/Makefile b/english/ports/powerpc/inst/Makefile index 5655f30ee0b..9fb780ad5f5 100644 --- a/english/ports/powerpc/inst/Makefile +++ b/english/ports/powerpc/inst/Makefile @@ -10,7 +10,7 @@ include $(WMLBASE)/Make.lang $(HTMLFILES): $(ENGLISHSRCDIR)/ports/powerpc/inst/menu.inc \ $(TEMPLDIR)/submenu.wml $(TEMPLDIR)/template.wml -SGMLFILES := $(wildcard *.sgml) +SGMLFILES := $(sort $(wildcard *.sgml)) # TODO: add more boot-floppies/documentation/Makefile magic for translations %.html/index.$(LANGUAGE).html: %.sgml diff --git a/english/releases/buster/Makefile b/english/releases/buster/Makefile index 744ff3b4d7b..5ba375863e0 100644 --- a/english/releases/buster/Makefile +++ b/english/releases/buster/Makefile @@ -13,9 +13,9 @@ index.$(LANGUAGE).html: index.wml $(TEMPLDIR)/release.wml \ releasenotes.$(LANGUAGE).html: releasenotes.wml $(TEMPLDIR)/release.wml \ $(ENGLISHDIR)/releases/buster/release.data $(TEMPLDIR)/release_info.wml \ $(ENGLISHDIR)/releases/arches.data \ - $(wildcard $(HTMLDIR)/*/release-notes*) + $(sort $(wildcard $(HTMLDIR)/*/release-notes*)) installmanual.$(LANGUAGE).html: installmanual.wml $(TEMPLDIR)/release.wml \ $(ENGLISHDIR)/releases/buster/release.data $(TEMPLDIR)/release_info.wml \ $(ENGLISHDIR)/releases/arches.data \ - $(wildcard $(HTMLDIR)/*/install*) + $(sort $(wildcard $(HTMLDIR)/*/install*)) diff --git a/english/releases/etch/Makefile b/english/releases/etch/Makefile index 276f2fcdd96..da1d53046f6 100644 --- a/english/releases/etch/Makefile +++ b/english/releases/etch/Makefile @@ -12,11 +12,11 @@ index.$(LANGUAGE).html: index.wml $(TEMPLDIR)/release.wml \ releasenotes.$(LANGUAGE).html: releasenotes.wml $(TEMPLDIR)/release.wml \ $(ENGLISHDIR)/releases/etch/release.data $(TEMPLDIR)/release_info.wml \ - $(wildcard $(HTMLDIR)/*/release-notes*) + $(sort $(wildcard $(HTMLDIR)/*/release-notes*)) installmanual.$(LANGUAGE).html: installmanual.wml $(TEMPLDIR)/release.wml \ $(ENGLISHDIR)/releases/etch/release.data $(TEMPLDIR)/release_info.wml \ - $(wildcard $(HTMLDIR)/*/install*) + $(sort $(wildcard $(HTMLDIR)/*/install*)) etchnhalf.$(LANGUAGE).html: etchnhalf.wml $(TEMPLDIR)/release.wml \ $(ENGLISHDIR)/releases/etch/release.data diff --git a/english/releases/hamm/autoup/Makefile b/english/releases/hamm/autoup/Makefile index b1e880a12b0..a4503a52ecb 100644 --- a/english/releases/hamm/autoup/Makefile +++ b/english/releases/hamm/autoup/Makefile @@ -8,7 +8,7 @@ include $(WMLBASE)/Make.lang ifeq "$(LANGUAGE)" "en" -autoupfiles := $(wildcard libc5-libc6-Mini-HOWTO*) $(wildcard autoup*) +autoupfiles := $(sort $(wildcard libc5-libc6-Mini-HOWTO*)) $(sort $(wildcard autoup*)) destautoupfiles := $(patsubst %,$(HTMLDIR)/%,$(autoupfiles)) diff --git a/english/releases/jessie/Makefile b/english/releases/jessie/Makefile index bf2b9e426e7..97835f7df4f 100644 --- a/english/releases/jessie/Makefile +++ b/english/releases/jessie/Makefile @@ -13,9 +13,9 @@ index.$(LANGUAGE).html: index.wml $(TEMPLDIR)/release.wml \ releasenotes.$(LANGUAGE).html: releasenotes.wml $(TEMPLDIR)/release.wml \ $(ENGLISHDIR)/releases/jessie/release.data $(TEMPLDIR)/release_info.wml \ $(ENGLISHDIR)/releases/arches.data \ - $(wildcard $(HTMLDIR)/*/release-notes*) + $(sort $(wildcard $(HTMLDIR)/*/release-notes*)) installmanual.$(LANGUAGE).html: installmanual.wml $(TEMPLDIR)/release.wml \ $(ENGLISHDIR)/releases/jessie/release.data $(TEMPLDIR)/release_info.wml \ $(ENGLISHDIR)/releases/arches.data \ - $(wildcard $(HTMLDIR)/*/install*) + $(sort $(wildcard $(HTMLDIR)/*/install*)) diff --git a/english/releases/lenny/Makefile b/english/releases/lenny/Makefile index 3560525df76..5a616fbb6a0 100644 --- a/english/releases/lenny/Makefile +++ b/english/releases/lenny/Makefile @@ -12,11 +12,11 @@ index.$(LANGUAGE).html: index.wml $(TEMPLDIR)/release.wml \ releasenotes.$(LANGUAGE).html: releasenotes.wml $(TEMPLDIR)/release.wml \ $(ENGLISHDIR)/releases/lenny/release.data $(TEMPLDIR)/release_info.wml \ - $(wildcard $(HTMLDIR)/*/release-notes*) + $(sort $(wildcard $(HTMLDIR)/*/release-notes*)) installmanual.$(LANGUAGE).html: installmanual.wml $(TEMPLDIR)/release.wml \ $(ENGLISHDIR)/releases/lenny/release.data $(TEMPLDIR)/release_info.wml \ - $(wildcard $(HTMLDIR)/*/install*) + $(sort $(wildcard $(HTMLDIR)/*/install*)) $(ENGLISHSRCDIR)/$(CUR_DIR)/release.data: $(TEMPLDIR)/installer.wml touch $@ diff --git a/english/releases/sarge/Makefile b/english/releases/sarge/Makefile index e809b75fc14..b8e4d1afdb9 100644 --- a/english/releases/sarge/Makefile +++ b/english/releases/sarge/Makefile @@ -12,11 +12,11 @@ index.$(LANGUAGE).html: index.wml $(TEMPLDIR)/release.wml \ releasenotes.$(LANGUAGE).html: releasenotes.wml $(TEMPLDIR)/release.wml \ $(ENGLISHDIR)/releases/sarge/release.data $(TEMPLDIR)/release_info.wml \ - $(wildcard $(HTMLDIR)/*/release-notes*) + $(sort $(wildcard $(HTMLDIR)/*/release-notes*)) installmanual.$(LANGUAGE).html: installmanual.wml $(TEMPLDIR)/release.wml \ $(ENGLISHDIR)/releases/sarge/release.data $(TEMPLDIR)/release_info.wml \ - $(wildcard $(HTMLDIR)/*/install*) + $(sort $(wildcard $(HTMLDIR)/*/install*)) $(ENGLISHSRCDIR)/$(CUR_DIR)/release.data: $(TEMPLDIR)/installer.wml touch $@ diff --git a/english/releases/squeeze/Makefile b/english/releases/squeeze/Makefile index db646d3a6b7..6151fc2d253 100644 --- a/english/releases/squeeze/Makefile +++ b/english/releases/squeeze/Makefile @@ -12,11 +12,11 @@ index.$(LANGUAGE).html: index.wml $(TEMPLDIR)/release.wml \ releasenotes.$(LANGUAGE).html: releasenotes.wml $(TEMPLDIR)/release.wml \ $(ENGLISHDIR)/releases/squeeze/release.data $(TEMPLDIR)/release_info.wml \ - $(wildcard $(HTMLDIR)/*/release-notes*) + $(sort $(wildcard $(HTMLDIR)/*/release-notes*)) installmanual.$(LANGUAGE).html: installmanual.wml $(TEMPLDIR)/release.wml \ $(ENGLISHDIR)/releases/squeeze/release.data $(TEMPLDIR)/release_info.wml \ - $(wildcard $(HTMLDIR)/*/install*) + $(sort $(wildcard $(HTMLDIR)/*/install*)) $(ENGLISHSRCDIR)/$(CUR_DIR)/release.data: $(TEMPLDIR)/installer.wml touch $@ diff --git a/english/releases/stretch/Makefile b/english/releases/stretch/Makefile index cce60161b39..34cd6fb504d 100644 --- a/english/releases/stretch/Makefile +++ b/english/releases/stretch/Makefile @@ -13,9 +13,9 @@ index.$(LANGUAGE).html: index.wml $(TEMPLDIR)/release.wml \ releasenotes.$(LANGUAGE).html: releasenotes.wml $(TEMPLDIR)/release.wml \ $(ENGLISHDIR)/releases/stretch/release.data $(TEMPLDIR)/release_info.wml \ $(ENGLISHDIR)/releases/arches.data \ - $(wildcard $(HTMLDIR)/*/release-notes*) + $(sort $(wildcard $(HTMLDIR)/*/release-notes*)) installmanual.$(LANGUAGE).html: installmanual.wml $(TEMPLDIR)/release.wml \ $(ENGLISHDIR)/releases/stretch/release.data $(TEMPLDIR)/release_info.wml \ $(ENGLISHDIR)/releases/arches.data \ - $(wildcard $(HTMLDIR)/*/install*) + $(sort $(wildcard $(HTMLDIR)/*/install*)) diff --git a/english/releases/wheezy/Makefile b/english/releases/wheezy/Makefile index 16a0de621f3..d7c5c202cc7 100644 --- a/english/releases/wheezy/Makefile +++ b/english/releases/wheezy/Makefile @@ -15,12 +15,12 @@ index.$(LANGUAGE).html: index.wml $(TEMPLDIR)/release.wml \ releasenotes.$(LANGUAGE).html: releasenotes.wml $(TEMPLDIR)/release.wml \ $(ENGLISHDIR)/releases/wheezy/release.data $(TEMPLDIR)/release_info.wml \ $(ENGLISHDIR)/releases/arches.data \ - $(wildcard $(HTMLDIR)/*/release-notes*) + $(sort $(wildcard $(HTMLDIR)/*/release-notes*)) installmanual.$(LANGUAGE).html: installmanual.wml $(TEMPLDIR)/release.wml \ $(ENGLISHDIR)/releases/wheezy/release.data $(TEMPLDIR)/release_info.wml \ $(ENGLISHDIR)/releases/arches.data \ - $(wildcard $(HTMLDIR)/*/install*) + $(sort $(wildcard $(HTMLDIR)/*/install*)) $(ENGLISHSRCDIR)/$(CUR_DIR)/release.data: $(TEMPLDIR)/release_images.wml touch $@ diff --git a/english/security/1997/Makefile b/english/security/1997/Makefile index 3c6fff655f2..cc8a74cdaa9 100644 --- a/english/security/1997/Makefile +++ b/english/security/1997/Makefile @@ -13,8 +13,8 @@ include $(WMLBASE)/Make.lang # check that the prerequisite exists and is up to date, but don't # rebuild everything whenever it's updated - see # https://www.gnu.org/software/make/manual/html_node/Prerequisite-Types.html -index.$(LANGUAGE).html: index.wml $(wildcard [0-9]*.wml) \ - $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/[0-9]*.data) \ +index.$(LANGUAGE).html: index.wml $(sort $(wildcard [0-9]*.wml)) \ + $(sort $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/[0-9]*.data)) \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list.wml | $(VCSREVCACHE) $(WML) $(<F) diff --git a/english/security/1998/Makefile b/english/security/1998/Makefile index d923bbffa49..546fa2d8f70 100644 --- a/english/security/1998/Makefile +++ b/english/security/1998/Makefile @@ -13,8 +13,8 @@ include $(WMLBASE)/Make.lang # check that the prerequisite exists and is up to date, but don't # rebuild everything whenever it's updated - see # https://www.gnu.org/software/make/manual/html_node/Prerequisite-Types.html -index.$(LANGUAGE).html: index.wml $(wildcard [0-9]*.wml) \ - $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/[0-9]*.data) \ +index.$(LANGUAGE).html: index.wml $(sort $(wildcard [0-9]*.wml)) \ + $(sort $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/[0-9]*.data)) \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list.wml | $(VCSREVCACHE) $(WML) $(<F) diff --git a/english/security/1999/Makefile b/english/security/1999/Makefile index c1b5effa3b8..87d450b48e7 100644 --- a/english/security/1999/Makefile +++ b/english/security/1999/Makefile @@ -13,8 +13,8 @@ include $(WMLBASE)/Make.lang # check that the prerequisite exists and is up to date, but don't # rebuild everything whenever it's updated - see # https://www.gnu.org/software/make/manual/html_node/Prerequisite-Types.html -index.$(LANGUAGE).html: index.wml $(wildcard [0-9]*.wml) \ - $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/[0-9]*.data) \ +index.$(LANGUAGE).html: index.wml $(sort $(wildcard [0-9]*.wml)) \ + $(sort $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/[0-9]*.data)) \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list.wml | $(VCSREVCACHE) $(WML) $(<F) diff --git a/english/security/2000/Makefile b/english/security/2000/Makefile index 0093facc9ae..cc2203717c1 100644 --- a/english/security/2000/Makefile +++ b/english/security/2000/Makefile @@ -19,7 +19,7 @@ include $(WMLBASE)/Make.lang $(ENGLISHSRCDIR)/$(CUR_DIR)/%.data $(GETTEXTDEP) | $(VCSREVCACHE) $(WML) $(<F) -index.$(LANGUAGE).html: index.wml $(wildcard [0-9]*.wml) \ - $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/[0-9]*.data) \ +index.$(LANGUAGE).html: index.wml $(sort $(wildcard [0-9]*.wml)) \ + $(sort $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/[0-9]*.data)) \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list.wml $(GETTEXTDEP) | $(VCSREVCACHE) $(WML) $(<F) diff --git a/english/security/2001/Makefile b/english/security/2001/Makefile index 90dc7910d9d..fb699c00c35 100644 --- a/english/security/2001/Makefile +++ b/english/security/2001/Makefile @@ -19,7 +19,7 @@ include $(WMLBASE)/Make.lang $(ENGLISHSRCDIR)/$(CUR_DIR)/%.data $(GETTEXTDEP) | $(VCSREVCACHE) $(WML) $(<F) -index.$(LANGUAGE).html: index.wml $(wildcard dsa-[0-9]*.wml) \ +index.$(LANGUAGE).html: index.wml $(sort $(wildcard dsa-[0-9]*.wml)) \ $(ENGLISHSRCDIR)/$(CUR_DIR)/dsa-[0-9]*.data \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list.wml $(GETTEXTDEP) | $(VCSREVCACHE) $(WML) $(<F) diff --git a/english/security/2002/Makefile b/english/security/2002/Makefile index 4130a78a0bc..656524a46b3 100644 --- a/english/security/2002/Makefile +++ b/english/security/2002/Makefile @@ -19,7 +19,7 @@ include $(WMLBASE)/Make.lang $(ENGLISHSRCDIR)/$(CUR_DIR)/%.data $(GETTEXTDEP) | $(VCSREVCACHE) $(WML) $(<F) -index.$(LANGUAGE).html: index.wml $(wildcard dsa-[0-9]*.wml) \ +index.$(LANGUAGE).html: index.wml $(sort $(wildcard dsa-[0-9]*.wml)) \ $(ENGLISHSRCDIR)/$(CUR_DIR)/dsa-[0-9]*.data \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list.wml $(GETTEXTDEP) | $(VCSREVCACHE) $(WML) $(<F) diff --git a/english/security/2003/Makefile b/english/security/2003/Makefile index 0ca73d36be7..25f5fbce658 100644 --- a/english/security/2003/Makefile +++ b/english/security/2003/Makefile @@ -19,7 +19,7 @@ include $(WMLBASE)/Make.lang $(ENGLISHSRCDIR)/$(CUR_DIR)/%.data $(GETTEXTDEP) | $(VCSREVCACHE) $(WML) $(<F) -index.$(LANGUAGE).html: index.wml $(wildcard dsa-[0-9]*.wml) \ +index.$(LANGUAGE).html: index.wml $(sort $(wildcard dsa-[0-9]*.wml)) \ $(ENGLISHSRCDIR)/$(CUR_DIR)/dsa-[0-9]*.data \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list.wml $(GETTEXTDEP) | $(VCSREVCACHE) $(WML) $(<F) diff --git a/english/security/2004/Makefile b/english/security/2004/Makefile index be2a52b86cb..d9c023a547b 100644 --- a/english/security/2004/Makefile +++ b/english/security/2004/Makefile @@ -19,7 +19,7 @@ include $(WMLBASE)/Make.lang $(ENGLISHSRCDIR)/$(CUR_DIR)/%.data $(GETTEXTDEP) | $(VCSREVCACHE) $(WML) $(<F) -index.$(LANGUAGE).html: index.wml $(wildcard dsa-[0-9]*.wml) \ +index.$(LANGUAGE).html: index.wml $(sort $(wildcard dsa-[0-9]*.wml)) \ $(ENGLISHSRCDIR)/$(CUR_DIR)/dsa-[0-9]*.data \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list.wml $(GETTEXTDEP) | $(VCSREVCACHE) $(WML) $(<F) diff --git a/english/security/2005/Makefile b/english/security/2005/Makefile index 04e16defde5..a1ceb0437ac 100644 --- a/english/security/2005/Makefile +++ b/english/security/2005/Makefile @@ -19,7 +19,7 @@ include $(WMLBASE)/Make.lang $(ENGLISHSRCDIR)/$(CUR_DIR)/%.data $(GETTEXTDEP) | $(VCSREVCACHE) $(WML) $(<F) -index.$(LANGUAGE).html: index.wml $(wildcard dsa-[0-9]*.wml) \ +index.$(LANGUAGE).html: index.wml $(sort $(wildcard dsa-[0-9]*.wml)) \ $(ENGLISHSRCDIR)/$(CUR_DIR)/dsa-[0-9]*.data \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list.wml $(GETTEXTDEP) | $(VCSREVCACHE) $(WML) $(<F) diff --git a/english/security/2006/Makefile b/english/security/2006/Makefile index 9fcb3a762d4..838d636e5b0 100644 --- a/english/security/2006/Makefile +++ b/english/security/2006/Makefile @@ -19,7 +19,7 @@ include $(WMLBASE)/Make.lang $(ENGLISHSRCDIR)/$(CUR_DIR)/%.data $(GETTEXTDEP) | $(VCSREVCACHE) $(WML) $(<F) -index.$(LANGUAGE).html: index.wml $(wildcard dsa-[0-9]*.wml) \ +index.$(LANGUAGE).html: index.wml $(sort $(wildcard dsa-[0-9]*.wml)) \ $(ENGLISHSRCDIR)/$(CUR_DIR)/dsa-[0-9]*.data \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list.wml $(GETTEXTDEP) | $(VCSREVCACHE) $(WML) $(<F) diff --git a/english/security/2007/Makefile b/english/security/2007/Makefile index ed6fa62eea7..4c8ae6b70fc 100644 --- a/english/security/2007/Makefile +++ b/english/security/2007/Makefile @@ -19,7 +19,7 @@ include $(WMLBASE)/Make.lang $(ENGLISHSRCDIR)/$(CUR_DIR)/%.data $(GETTEXTDEP) | $(VCSREVCACHE) $(WML) $(<F) -index.$(LANGUAGE).html: index.wml $(wildcard dsa-[0-9]*.wml) \ +index.$(LANGUAGE).html: index.wml $(sort $(wildcard dsa-[0-9]*.wml)) \ $(ENGLISHSRCDIR)/$(CUR_DIR)/dsa-[0-9]*.data \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list.wml $(GETTEXTDEP) | $(VCSREVCACHE) $(WML) $(<F) diff --git a/english/security/2008/Makefile b/english/security/2008/Makefile index 6c5f5d93e7b..3fca750e900 100644 --- a/english/security/2008/Makefile +++ b/english/security/2008/Makefile @@ -19,7 +19,7 @@ include $(WMLBASE)/Make.lang $(ENGLISHSRCDIR)/$(CUR_DIR)/%.data $(GETTEXTDEP) | $(VCSREVCACHE) $(WML) $(<F) -index.$(LANGUAGE).html: index.wml $(wildcard dsa-[0-9]*.wml) \ +index.$(LANGUAGE).html: index.wml $(sort $(wildcard dsa-[0-9]*.wml)) \ $(ENGLISHSRCDIR)/$(CUR_DIR)/dsa-[0-9]*.data \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list.wml $(GETTEXTDEP) | $(VCSREVCACHE) $(WML) $(<F) diff --git a/english/security/2009/Makefile b/english/security/2009/Makefile index 1e458e43f31..922d116031c 100644 --- a/english/security/2009/Makefile +++ b/english/security/2009/Makefile @@ -19,7 +19,7 @@ include $(WMLBASE)/Make.lang $(ENGLISHSRCDIR)/$(CUR_DIR)/%.data $(GETTEXTDEP) | $(VCSREVCACHE) $(WML) $(<F) -index.$(LANGUAGE).html: index.wml $(wildcard dsa-[0-9]*.wml) \ +index.$(LANGUAGE).html: index.wml $(sort $(wildcard dsa-[0-9]*.wml)) \ $(ENGLISHSRCDIR)/$(CUR_DIR)/dsa-[0-9]*.data \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list.wml $(GETTEXTDEP) | $(VCSREVCACHE) $(WML) $(<F) diff --git a/english/security/2010/Makefile b/english/security/2010/Makefile index 4904cb60a4f..be1b81fb9fc 100644 --- a/english/security/2010/Makefile +++ b/english/security/2010/Makefile @@ -19,7 +19,7 @@ include $(WMLBASE)/Make.lang $(ENGLISHSRCDIR)/$(CUR_DIR)/%.data $(GETTEXTDEP) | $(VCSREVCACHE) $(WML) $(<F) -index.$(LANGUAGE).html: index.wml $(wildcard dsa-[0-9]*.wml) \ +index.$(LANGUAGE).html: index.wml $(sort $(wildcard dsa-[0-9]*.wml)) \ $(ENGLISHSRCDIR)/$(CUR_DIR)/dsa-[0-9]*.data \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list.wml $(GETTEXTDEP) | $(VCSREVCACHE) $(WML) $(<F) diff --git a/english/security/2011/Makefile b/english/security/2011/Makefile index 9970b877dd6..f8e318dcaf0 100644 --- a/english/security/2011/Makefile +++ b/english/security/2011/Makefile @@ -19,7 +19,7 @@ include $(WMLBASE)/Make.lang $(ENGLISHSRCDIR)/$(CUR_DIR)/%.data $(GETTEXTDEP) | $(VCSREVCACHE) $(WML) $(<F) -index.$(LANGUAGE).html: index.wml $(wildcard dsa-[0-9]*.wml) \ +index.$(LANGUAGE).html: index.wml $(sort $(wildcard dsa-[0-9]*.wml)) \ $(ENGLISHSRCDIR)/$(CUR_DIR)/dsa-[0-9]*.data \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list.wml $(GETTEXTDEP) | $(VCSREVCACHE) $(WML) $(<F) diff --git a/english/security/2012/Makefile b/english/security/2012/Makefile index e90ad6ccde9..41e3233228a 100644 --- a/english/security/2012/Makefile +++ b/english/security/2012/Makefile @@ -19,7 +19,7 @@ include $(WMLBASE)/Make.lang $(ENGLISHSRCDIR)/$(CUR_DIR)/%.data $(GETTEXTDEP) | $(VCSREVCACHE) $(WML) $(<F) -index.$(LANGUAGE).html: index.wml $(wildcard dsa-[0-9]*.wml) \ +index.$(LANGUAGE).html: index.wml $(sort $(wildcard dsa-[0-9]*.wml)) \ $(ENGLISHSRCDIR)/$(CUR_DIR)/dsa-[0-9]*.data \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list.wml $(GETTEXTDEP) | $(VCSREVCACHE) $(WML) $(<F) diff --git a/english/security/2013/Makefile b/english/security/2013/Makefile index 290097b3e62..ff32bb16ea3 100644 --- a/english/security/2013/Makefile +++ b/english/security/2013/Makefile @@ -19,7 +19,7 @@ include $(WMLBASE)/Make.lang $(ENGLISHSRCDIR)/$(CUR_DIR)/%.data $(GETTEXTDEP) | $(VCSREVCACHE) $(WML) $(<F) -index.$(LANGUAGE).html: index.wml $(wildcard dsa-[0-9]*.wml) \ +index.$(LANGUAGE).html: index.wml $(sort $(wildcard dsa-[0-9]*.wml)) \ $(ENGLISHSRCDIR)/$(CUR_DIR)/dsa-[0-9]*.data \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list.wml $(GETTEXTDEP) | $(VCSREVCACHE) $(WML) $(<F) diff --git a/english/security/2014/Makefile b/english/security/2014/Makefile index 204f097942e..894b87d90e5 100644 --- a/english/security/2014/Makefile +++ b/english/security/2014/Makefile @@ -20,6 +20,6 @@ include $(WMLBASE)/Make.lang $(WML) $(<F) index.$(LANGUAGE).html: index.wml \ - $(wildcard dsa-[0-9]*.wml) $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/dsa-[0-9]*.data) \ + $(sort $(wildcard dsa-[0-9]*.wml)) $(sort $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/dsa-[0-9]*.data)) \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list_security.wml $(GETTEXTDEP) | $(VCSREVCACHE) $(WML) $(<F) diff --git a/english/security/2015/Makefile b/english/security/2015/Makefile index 49c8a4ea61e..6365dd0a6fb 100644 --- a/english/security/2015/Makefile +++ b/english/security/2015/Makefile @@ -20,6 +20,6 @@ include $(WMLBASE)/Make.lang $(WML) $(<F) index.$(LANGUAGE).html: index.wml \ - $(wildcard dsa-[0-9]*.wml) $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/dsa-[0-9]*.data) \ + $(sort $(wildcard dsa-[0-9]*.wml)) $(sort $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/dsa-[0-9]*.data)) \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list_security.wml $(GETTEXTDEP) | $(VCSREVCACHE) $(WML) $(<F) diff --git a/english/security/2016/Makefile b/english/security/2016/Makefile index 130ea711877..4901a952476 100644 --- a/english/security/2016/Makefile +++ b/english/security/2016/Makefile @@ -20,6 +20,6 @@ include $(WMLBASE)/Make.lang $(WML) $(<F) index.$(LANGUAGE).html: index.wml \ - $(wildcard dsa-[0-9]*.wml) $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/dsa-[0-9]*.data) \ + $(sort $(wildcard dsa-[0-9]*.wml)) $(sort $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/dsa-[0-9]*.data)) \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list_security.wml $(GETTEXTDEP) | $(VCSREVCACHE) $(WML) $(<F) diff --git a/english/security/2017/Makefile b/english/security/2017/Makefile index 101c5ae77e5..e7ffc5919fb 100644 --- a/english/security/2017/Makefile +++ b/english/security/2017/Makefile @@ -18,7 +18,7 @@ INDEXPAGE = $(sort $(foreach i,$(SUBLANG),$(subst index,index.$(LANGUAGE)-$(i),i endif $(INDEXPAGE): index.wml \ - $(wildcard dsa-[0-9]*.wml) $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/dsa-[0-9]*.data) \ + $(sort $(wildcard dsa-[0-9]*.wml)) $(sort $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/dsa-[0-9]*.data)) \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list_security.wml $(GETTEXTDEP) | $(VCSREVCACHE) ifeq "$(LANGUAGE)" "zh" @echo -n "Processing $(<F): " diff --git a/english/security/2018/Makefile b/english/security/2018/Makefile index c62a88bda92..ab3c420bf3b 100644 --- a/english/security/2018/Makefile +++ b/english/security/2018/Makefile @@ -22,7 +22,7 @@ endif # rebuild everything whenever it's updated - see # https://www.gnu.org/software/make/manual/html_node/Prerequisite-Types.html $(INDEXPAGE): index.wml \ - $(wildcard dsa-[0-9]*.wml) $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/dsa-[0-9]*.data) \ + $(sort $(wildcard dsa-[0-9]*.wml)) $(sort $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/dsa-[0-9]*.data)) \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list_security.wml $(GETTEXTDEP) | $(VCSREVCACHE) ifeq "$(LANGUAGE)" "zh" @echo -n "Processing $(<F): " diff --git a/english/security/2019/Makefile b/english/security/2019/Makefile index a9ca5016cf5..5964f51bd97 100644 --- a/english/security/2019/Makefile +++ b/english/security/2019/Makefile @@ -22,7 +22,7 @@ endif # rebuild everything whenever it's updated - see # https://www.gnu.org/software/make/manual/html_node/Prerequisite-Types.html $(INDEXPAGE): index.wml \ - $(wildcard dsa-[0-9]*.wml) $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/dsa-[0-9]*.data) \ + $(sort $(wildcard dsa-[0-9]*.wml)) $(sort $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/dsa-[0-9]*.data)) \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list_security.wml $(GETTEXTDEP) | $(VCSREVCACHE) ifeq "$(LANGUAGE)" "zh" @echo -n "Processing $(<F): " diff --git a/english/security/Makefile b/english/security/Makefile index 579ed1f90b8..cf7dfa92d11 100644 --- a/english/security/Makefile +++ b/english/security/Makefile @@ -3,7 +3,7 @@ WMLBASE=.. CUR_DIR=security -SUBS=undated $(wildcard [12][0-9][0-9][0-9]) audit oval key-rollover +SUBS=undated $(sort $(wildcard [12][0-9][0-9][0-9])) audit oval key-rollover # TODO: Check that 'oval' works now that RT #160 (rt.debian.org) has been closed GETTEXTFILES += security.mo @@ -27,9 +27,9 @@ DESTDSALONGRDF := $(patsubst %.rdf,$(HTMLDIR)/%.rdf,$(DSALONGRDF)) endif -$(INDEXPAGE): index.wml $(wildcard $(CUR_YEAR)/dsa-*.wml) \ - $(wildcard $(ENGLISHSRCDIR)/security/$(CUR_YEAR)/dsa-*.wml) \ - $(wildcard $(ENGLISHSRCDIR)/security/$(CUR_YEAR)/dsa-*.data) \ +$(INDEXPAGE): index.wml $(sort $(wildcard $(CUR_YEAR)/dsa-*.wml)) \ + $(sort $(wildcard $(ENGLISHSRCDIR)/security/$(CUR_YEAR)/dsa-*.wml)) \ + $(sort $(wildcard $(ENGLISHSRCDIR)/security/$(CUR_YEAR)/dsa-*.data)) \ $(TEMPLDIR)/release_info.wml \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list_security.wml $(GETTEXTDEP) @@ -50,7 +50,7 @@ faq.$(LANGUAGE).html: faq.wml \ $(ENGLISHSRCDIR)/security/faq.wml \ $(ENGLISHSRCDIR)/security/faq.inc $(GETTEXTDEP) -$(ENGLISHSRCDIR)/security/ref-table.inc: $(ENGLISHSRCDIR)/security/make-ref-table.pl $(wildcard $(ENGLISHSRCDIR)/security/*/*.data) +$(ENGLISHSRCDIR)/security/ref-table.inc: $(ENGLISHSRCDIR)/security/make-ref-table.pl $(sort $(wildcard $(ENGLISHSRCDIR)/security/*/*.data)) perl $(ENGLISHSRCDIR)/security/make-ref-table.pl -p -a >$(ENGLISHSRCDIR)/security/ref-table.inc crossreferences.$(LANGUAGE).html:: $(ENGLISHSRCDIR)/security/ref-table.inc \ @@ -61,9 +61,9 @@ clean:: rm -f ref-table.inc $(DSARDF): $(ENGLISHDIR)/security/dsa.rdf.in \ - $(wildcard $(CUR_YEAR)/dsa-*.wml) \ - $(wildcard $(ENGLISHDIR)/security/$(CUR_YEAR)/dsa-*.wml) \ - $(wildcard $(ENGLISHDIR)/security/$(CUR_YEAR)/dsa-*.data) \ + $(sort $(wildcard $(CUR_YEAR)/dsa-*.wml)) \ + $(sort $(wildcard $(ENGLISHDIR)/security/$(CUR_YEAR)/dsa-*.wml)) \ + $(sort $(wildcard $(ENGLISHDIR)/security/$(CUR_YEAR)/dsa-*.data)) \ $(TEMPLDIR)/recent_list_security.wml $(GETTEXTDEP) ifeq "$(LANGUAGE)" "zh" @echo -n "Processing $(<F): " @@ -77,9 +77,9 @@ else endif $(DSALONGRDF): $(ENGLISHDIR)/security/dsa-long.rdf.in \ - $(wildcard $(CUR_YEAR)/dsa-*.wml) \ - $(wildcard $(ENGLISHDIR)/security/$(CUR_YEAR)/dsa-*.wml) \ - $(wildcard $(ENGLISHDIR)/security/$(CUR_YEAR)/dsa-*.data) \ + $(sort $(wildcard $(CUR_YEAR)/dsa-*.wml)) \ + $(sort $(wildcard $(ENGLISHDIR)/security/$(CUR_YEAR)/dsa-*.wml)) \ + $(sort $(wildcard $(ENGLISHDIR)/security/$(CUR_YEAR)/dsa-*.data)) \ $(TEMPLDIR)/recent_list_security.wml $(GETTEXTDEP) ifeq "$(LANGUAGE)" "zh" @echo -n "Processing $(<F): " @@ -93,9 +93,9 @@ else endif $(DSAALLRDF): $(ENGLISHDIR)/security/dsa-all.rdf.in \ - $(wildcard ????/dsa-*.wml) \ - $(wildcard $(ENGLISHDIR)/security/????/dsa-*.wml) \ - $(wildcard $(ENGLISHDIR)/security/????/dsa-*.data) \ + $(sort $(wildcard ????/dsa-*.wml)) \ + $(sort $(wildcard $(ENGLISHDIR)/security/????/dsa-*.wml)) \ + $(sort $(wildcard $(ENGLISHDIR)/security/????/dsa-*.data)) \ $(TEMPLDIR)/recent_list.wml $(GETTEXTDEP) ifeq "$(LANGUAGE)" "zh" @echo -n "Processing $(<F): " @@ -125,7 +125,7 @@ ifeq "$(LANGUAGE)" "en" map := $(HTMLDIR)/map-dsa.txt -$(map): $(wildcard $(CUR_YEAR)/dsa-*.wml) +$(map): $(sort $(wildcard $(CUR_YEAR)/dsa-*.wml)) for i in 2*/dsa-*.wml; do echo $$i $$i | sed -r 's/^.+\/(.+) /\1 /' | sed 's/\.wml//g' | sed 's/^dsa-//' ;done > $(HTMLDIR)/map-dsa.txt install:: $(map) diff --git a/english/security/audit/Makefile b/english/security/audit/Makefile index 0dd50c0ee28..1c8181e0002 100644 --- a/english/security/audit/Makefile +++ b/english/security/audit/Makefile @@ -10,12 +10,12 @@ clean:: -rm ./data/[0-9]*.inc -rm ./data/credits.inc -ifeq "$(wildcard data/*.data)" "" +ifeq "$(sort $(wildcard data/*.data))" "" dsa: else dsa: $(ENGLISHDIR)/security/audit/make-advisories -$(ENGLISHDIR)/security/audit/make-advisories: $(wildcard data/*.data) +$(ENGLISHDIR)/security/audit/make-advisories: $(sort $(wildcard data/*.data)) $(ENGLISHDIR)/security/audit/make-advisories ./data endif diff --git a/english/security/parse-advisory.pl b/english/security/parse-advisory.pl index 9bf3115003c..bd6796e1202 100755 --- a/english/security/parse-advisory.pl +++ b/english/security/parse-advisory.pl @@ -293,7 +293,7 @@ sub make_makefile{ $makefile .= qq|\%.\$(LANGUAGE).html: \%.wml \$(TEMPLDIR)/security.wml \\\n|; $makefile .= qq| \$(ENGLISHSRCDIR)/\$(CUR_DIR)/\%.data \$(GETTEXTDEP) \| \$(VCSREVCACHE)\n|; $makefile .= qq|\t\$(WML) \$(<F)\n\n|; - $makefile .= qq|index.\$(LANGUAGE).html: index.wml \$(wildcard dsa-[0-9]*.wml) \\\n|; + $makefile .= qq|index.\$(LANGUAGE).html: index.wml \$(sort \$(wildcard dsa-[0-9]*.wml)) \\\n|; $makefile .= qq| \$(ENGLISHSRCDIR)/\$(CUR_DIR)/dsa-[0-9]*.data \\\n|; $makefile .= qq| \$(TEMPLDIR)/template.wml \$(TEMPLDIR)/recent_list.wml \$(GETTEXTDEP) \| \$(VCSREVCACHE)\n|; $makefile .= qq|\t\$(WML) \$(<F)\n|; diff --git a/english/security/undated/Makefile b/english/security/undated/Makefile index 4d58443237e..97372c16ba1 100644 --- a/english/security/undated/Makefile +++ b/english/security/undated/Makefile @@ -12,8 +12,8 @@ include $(WMLBASE)/Make.lang # check that the prerequisite exists and is up to date, but don't # rebuild everything whenever it's updated - see # https://www.gnu.org/software/make/manual/html_node/Prerequisite-Types.html -index.$(LANGUAGE).html: index.wml $(wildcard [0-9]*.wml) \ - $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/[0-9]*.data) \ +index.$(LANGUAGE).html: index.wml $(sort $(wildcard [0-9]*.wml)) \ + $(sort $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/[0-9]*.data)) \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list.wml | $(VCSREVCACHE) $(WML) $(<F) diff --git a/english/users/Makefile b/english/users/Makefile index cf25168ba69..d3c8d1ead60 100644 --- a/english/users/Makefile +++ b/english/users/Makefile @@ -8,10 +8,10 @@ SUBS=edu com org gov include $(WMLBASE)/Make.lang index.$(LANGUAGE).html: index.wml\ - $(wildcard edu/*.wml) $(wildcard $(ENGLISHSRCDIR)/users/edu/*.wml) \ - $(wildcard com/*.wml) $(wildcard $(ENGLISHSRCDIR)/users/com/*.wml) \ - $(wildcard org/*.wml) $(wildcard $(ENGLISHSRCDIR)/users/org/*.wml) \ - $(wildcard gov/*.wml) $(wildcard $(ENGLISHSRCDIR)/users/gov/*.wml) \ + $(sort $(wildcard edu/*.wml)) $(sort $(wildcard $(ENGLISHSRCDIR)/users/edu/*.wml)) \ + $(sort $(wildcard com/*.wml)) $(sort $(wildcard $(ENGLISHSRCDIR)/users/com/*.wml)) \ + $(sort $(wildcard org/*.wml)) $(sort $(wildcard $(ENGLISHSRCDIR)/users/org/*.wml)) \ + $(sort $(wildcard gov/*.wml)) $(sort $(wildcard $(ENGLISHSRCDIR)/users/gov/*.wml)) \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/users_list.wml \ $(TEMPLDIR)/languages.wml $(TEMPLDIR)/users.wml $(GETTEXTDEP) $(WML) $(<F) diff --git a/english/vote/1999/Makefile b/english/vote/1999/Makefile index 2827a712eed..f40bdebba12 100644 --- a/english/vote/1999/Makefile +++ b/english/vote/1999/Makefile @@ -4,7 +4,7 @@ WMLBASE=../.. CUR_DIR=vote/1999 SUBS= -VOTE=$(basename $(wildcard vote_*.wml)) +VOTE=$(basename $(sort $(wildcard vote_*.wml))) include $(WMLBASE)/Make.lang @@ -12,11 +12,11 @@ include $(WMLBASE)/Make.lang %.$(LANGUAGE).html: %.wml $(TEMPLDIR)/template.wml $(WML) $(<F) $(foreach i, $(VOTE), $(i).$(LANGUAGE).html): %.$(LANGUAGE).html: %.wml \ - $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/../[0-9]*/vote_*.wml) \ + $(sort $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/../[0-9]*/vote_*.wml)) \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/votebar.wml $(WML) $(<F) -index.$(LANGUAGE).html: index.wml $(wildcard vote_*.wml) \ - $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/../[0-9]*/vote_*.wml) \ +index.$(LANGUAGE).html: index.wml $(sort $(wildcard vote_*.wml)) \ + $(sort $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/../[0-9]*/vote_*.wml)) \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list.wml \ $(TEMPLDIR)/votebar.wml diff --git a/english/vote/2000/Makefile b/english/vote/2000/Makefile index d71493847cd..56a221b9a3f 100644 --- a/english/vote/2000/Makefile +++ b/english/vote/2000/Makefile @@ -4,7 +4,7 @@ WMLBASE=../.. CUR_DIR=vote/2000 SUBS=leadership_debate -VOTE=$(basename $(wildcard vote_*.wml)) +VOTE=$(basename $(sort $(wildcard vote_*.wml))) include $(WMLBASE)/Make.lang @@ -12,11 +12,11 @@ include $(WMLBASE)/Make.lang %.$(LANGUAGE).html: %.wml $(TEMPLDIR)/template.wml $(WML) $(<F) $(foreach i, $(VOTE), $(i).$(LANGUAGE).html): %.$(LANGUAGE).html: %.wml \ - $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/../[0-9]*/vote_*.wml) \ + $(sort $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/../[0-9]*/vote_*.wml)) \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/votebar.wml $(WML) $(<F) -index.$(LANGUAGE).html: index.wml $(wildcard vote_*.wml) \ - $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/../[0-9]*/vote_*.wml) \ +index.$(LANGUAGE).html: index.wml $(sort $(wildcard vote_*.wml)) \ + $(sort $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/../[0-9]*/vote_*.wml)) \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list.wml \ $(TEMPLDIR)/votebar.wml diff --git a/english/vote/2000/leadership_debate/Makefile b/english/vote/2000/leadership_debate/Makefile index b1b1f3e8c0d..015e7c5eb36 100644 --- a/english/vote/2000/leadership_debate/Makefile +++ b/english/vote/2000/leadership_debate/Makefile @@ -8,7 +8,7 @@ SUBS= include $(WMLBASE)/Make.lang index.$(LANGUAGE).html: index.wml \ - $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/../../[0-9]*/vote_*.wml) \ + $(sort $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/../../[0-9]*/vote_*.wml)) \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/votebar.wml ifeq "$(LANGUAGE)" "en" diff --git a/english/vote/2001/Makefile b/english/vote/2001/Makefile index 722ebf9db04..1bb55fdfffd 100644 --- a/english/vote/2001/Makefile +++ b/english/vote/2001/Makefile @@ -4,17 +4,17 @@ WMLBASE=../.. CUR_DIR=vote/2001 SUBS= -VOTE=$(basename $(wildcard vote_*.wml)) +VOTE=$(basename $(sort $(wildcard vote_*.wml))) include $(WMLBASE)/Make.lang $(foreach i, $(VOTE), $(i).$(LANGUAGE).html): %.$(LANGUAGE).html: %.wml \ - $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/../[0-9]*/vote_*.wml) \ + $(sort $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/../[0-9]*/vote_*.wml)) \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/votebar.wml $(WML) $(<F) -index.$(LANGUAGE).html: index.wml $(wildcard vote_*.wml) \ - $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/../[0-9]*/vote_*.wml) \ +index.$(LANGUAGE).html: index.wml $(sort $(wildcard vote_*.wml)) \ + $(sort $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/../[0-9]*/vote_*.wml)) \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list.wml \ $(TEMPLDIR)/votebar.wml diff --git a/english/vote/2002/Makefile b/english/vote/2002/Makefile index a0cd77df9e2..d46a3172292 100644 --- a/english/vote/2002/Makefile +++ b/english/vote/2002/Makefile @@ -4,17 +4,17 @@ WMLBASE=../.. CUR_DIR=vote/2002 SUBS=platforms -VOTE=$(basename $(wildcard vote_*.wml)) +VOTE=$(basename $(sort $(wildcard vote_*.wml))) include $(WMLBASE)/Make.lang $(foreach i, $(VOTE), $(i).$(LANGUAGE).html): %.$(LANGUAGE).html: %.wml \ - $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/../[0-9]*/vote_*.wml) \ + $(sort $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/../[0-9]*/vote_*.wml)) \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/votebar.wml $(WML) $(<F) -index.$(LANGUAGE).html: index.wml $(wildcard vote_*.wml) \ - $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/../[0-9]*/vote_*.wml) \ +index.$(LANGUAGE).html: index.wml $(sort $(wildcard vote_*.wml)) \ + $(sort $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/../[0-9]*/vote_*.wml)) \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list.wml \ $(TEMPLDIR)/votebar.wml diff --git a/english/vote/2002/platforms/Makefile b/english/vote/2002/platforms/Makefile index 4c1fd407ac0..88a01cd0958 100644 --- a/english/vote/2002/platforms/Makefile +++ b/english/vote/2002/platforms/Makefile @@ -8,5 +8,5 @@ SUBS= include $(WMLBASE)/Make.lang index.$(LANGUAGE).html: index.wml \ - $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/../../[0-9]*/vote_*.wml) \ + $(sort $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/../../[0-9]*/vote_*.wml)) \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/votebar.wml diff --git a/english/vote/2003/Makefile b/english/vote/2003/Makefile index 722f8905318..895f528bf5f 100644 --- a/english/vote/2003/Makefile +++ b/english/vote/2003/Makefile @@ -4,17 +4,17 @@ WMLBASE=../.. CUR_DIR=vote/2003 SUBS=platforms -VOTE=$(basename $(wildcard vote_*.wml)) +VOTE=$(basename $(sort $(wildcard vote_*.wml))) include $(WMLBASE)/Make.lang $(foreach i, $(VOTE), $(i).$(LANGUAGE).html): %.$(LANGUAGE).html: %.wml \ - $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/../[0-9]*/vote_*.wml) \ + $(sort $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/../[0-9]*/vote_*.wml)) \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/votebar.wml $(WML) $(<F) -index.$(LANGUAGE).html: index.wml $(wildcard vote_*.wml) \ - $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/../[0-9]*/vote_*.wml) \ +index.$(LANGUAGE).html: index.wml $(sort $(wildcard vote_*.wml)) \ + $(sort $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/../[0-9]*/vote_*.wml)) \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list.wml \ $(TEMPLDIR)/votebar.wml diff --git a/english/vote/2003/platforms/Makefile b/english/vote/2003/platforms/Makefile index 5fa33a8e8f0..d29c019029d 100644 --- a/english/vote/2003/platforms/Makefile +++ b/english/vote/2003/platforms/Makefile @@ -8,5 +8,5 @@ SUBS= include $(WMLBASE)/Make.lang index.$(LANGUAGE).html: index.wml \ - $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/../../[0-9]*/vote_*.wml) \ + $(sort $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/../../[0-9]*/vote_*.wml)) \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/votebar.wml diff --git a/english/vote/2004/Makefile b/english/vote/2004/Makefile index 328d6e62047..f51fd315dc7 100644 --- a/english/vote/2004/Makefile +++ b/english/vote/2004/Makefile @@ -4,17 +4,17 @@ WMLBASE=../.. CUR_DIR=vote/2004 SUBS=platforms -VOTE=$(basename $(wildcard vote_*.wml)) +VOTE=$(basename $(sort $(wildcard vote_*.wml))) include $(WMLBASE)/Make.lang $(foreach i, $(VOTE), $(i).$(LANGUAGE).html): %.$(LANGUAGE).html: %.wml \ - $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/../[0-9]*/vote_*.wml) \ + $(sort $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/../[0-9]*/vote_*.wml)) \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/votebar.wml $(WML) $(<F) -index.$(LANGUAGE).html: index.wml $(wildcard vote_*.wml) \ - $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/../[0-9]*/vote_*.wml) \ +index.$(LANGUAGE).html: index.wml $(sort $(wildcard vote_*.wml)) \ + $(sort $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/../[0-9]*/vote_*.wml)) \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list.wml \ $(TEMPLDIR)/votebar.wml diff --git a/english/vote/2004/platforms/Makefile b/english/vote/2004/platforms/Makefile index 4d8bf319bdb..be1ff7b0a93 100644 --- a/english/vote/2004/platforms/Makefile +++ b/english/vote/2004/platforms/Makefile @@ -8,5 +8,5 @@ SUBS= include $(WMLBASE)/Make.lang index.$(LANGUAGE).html: index.wml \ - $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/../../[0-9]*/vote_*.wml) \ + $(sort $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/../../[0-9]*/vote_*.wml)) \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/votebar.wml diff --git a/english/vote/2005/Makefile b/english/vote/2005/Makefile index d13be017c14..f5e9e86d9c9 100644 --- a/english/vote/2005/Makefile +++ b/english/vote/2005/Makefile @@ -4,18 +4,18 @@ WMLBASE=../.. CUR_DIR=vote/2005 SUBS=platforms -VOTE=$(basename $(wildcard vote_*.wml)) +VOTE=$(basename $(sort $(wildcard vote_*.wml))) include $(WMLBASE)/Make.lang $(foreach i, $(VOTE), $(i).$(LANGUAGE).html): %.$(LANGUAGE).html: %.wml \ - $(wildcard suppl_*.wml) \ - $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/../[0-9]*/vote_*.wml) \ + $(sort $(wildcard suppl_*.wml)) \ + $(sort $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/../[0-9]*/vote_*.wml)) \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/votebar.wml $(WML) $(<F) -index.$(LANGUAGE).html: index.wml $(wildcard vote_*.wml) \ - $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/../[0-9]*/vote_*.wml) \ +index.$(LANGUAGE).html: index.wml $(sort $(wildcard vote_*.wml)) \ + $(sort $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/../[0-9]*/vote_*.wml)) \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list.wml \ $(TEMPLDIR)/votebar.wml diff --git a/english/vote/2005/platforms/Makefile b/english/vote/2005/platforms/Makefile index 4b1e35a1a31..628c8962a91 100644 --- a/english/vote/2005/platforms/Makefile +++ b/english/vote/2005/platforms/Makefile @@ -8,5 +8,5 @@ SUBS= include $(WMLBASE)/Make.lang index.$(LANGUAGE).html: index.wml \ - $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/../../[0-9]*/vote_*.wml) \ + $(sort $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/../../[0-9]*/vote_*.wml)) \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/votebar.wml diff --git a/english/vote/2006/Makefile b/english/vote/2006/Makefile index 44ae864f2e7..cddc5d6ce37 100644 --- a/english/vote/2006/Makefile +++ b/english/vote/2006/Makefile @@ -4,24 +4,24 @@ WMLBASE=../.. CUR_DIR=vote/2006 SUBS=platforms -VOTE=$(basename $(wildcard vote_*.wml)) +VOTE=$(basename $(sort $(wildcard vote_*.wml))) include $(WMLBASE)/Make.lang $(foreach i, $(VOTE), $(i).$(LANGUAGE).html): %.$(LANGUAGE).html: %.wml \ - $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/../[0-9]*/vote_*.wml) \ - $(wildcard vote_*_quorum.txt) $(wildcard vote_*_quorum.src) \ - $(wildcard vote_*_majority.src) $(wildcard vote_*_results.src) \ + $(sort $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/../[0-9]*/vote_*.wml)) \ + $(sort $(wildcard vote_*_quorum.txt)) $(sort $(wildcard vote_*_quorum.src)) \ + $(sort $(wildcard vote_*_majority.src)) $(sort $(wildcard vote_*_results.src)) \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/votebar.wml $(WML) $(<F) index.$(LANGUAGE).html: index.wml \ - $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/../[0-9]*/vote_*.wml) \ + $(sort $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/../[0-9]*/vote_*.wml)) \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list.wml \ $(TEMPLDIR)/votebar.wml -$(foreach i, $(basename $(wildcard suppl_*_stats.wml)), $(i).$(LANGUAGE).html): \ -%.$(LANGUAGE).html: %.wml $(wildcard vote_*_index.src) +$(foreach i, $(basename $(sort $(wildcard suppl_*_stats.wml))), $(i).$(LANGUAGE).html): \ +%.$(LANGUAGE).html: %.wml $(sort $(wildcard vote_*_index.src)) $(WML) $(<F) ifeq "$(LANGUAGE)" "en" @@ -69,7 +69,7 @@ cleandest:: endif check: - for i in $(wildcard *.$(LANGUAGE).html); do \ + for i in $(sort $(wildcard *.$(LANGUAGE).html)); do \ echo $$i; \ onsgmls -e -g -s -u /usr/share/sgml/declaration/html.decl $$i; \ echo $$i done; \ diff --git a/english/vote/2006/platforms/Makefile b/english/vote/2006/platforms/Makefile index 16cb96cf782..66be07cd10d 100644 --- a/english/vote/2006/platforms/Makefile +++ b/english/vote/2006/platforms/Makefile @@ -8,5 +8,5 @@ SUBS= include $(WMLBASE)/Make.lang index.$(LANGUAGE).html: index.wml \ - $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/../../[0-9]*/vote_*.wml) \ + $(sort $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/../../[0-9]*/vote_*.wml)) \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/votebar.wml diff --git a/english/vote/2007/Makefile b/english/vote/2007/Makefile index 07af892b155..84e376f47c6 100644 --- a/english/vote/2007/Makefile +++ b/english/vote/2007/Makefile @@ -4,25 +4,25 @@ WMLBASE=../.. CUR_DIR=vote/2007 SUBS=platforms -VOTE=$(basename $(wildcard vote_*.wml)) +VOTE=$(basename $(sort $(wildcard vote_*.wml))) include $(WMLBASE)/Make.lang $(foreach i, $(VOTE), $(i).$(LANGUAGE).html): %.$(LANGUAGE).html: %.wml \ - $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/../[0-9]*/vote_*.wml) \ - $(wildcard vote_*_quorum.txt) $(wildcard vote_*_quorum.src) \ - $(wildcard vote_*_majority.txt) $(wildcard vote_*_majority.src) \ - $(wildcard vote_*_results.src) \ + $(sort $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/../[0-9]*/vote_*.wml)) \ + $(sort $(wildcard vote_*_quorum.txt)) $(sort $(wildcard vote_*_quorum.src)) \ + $(sort $(wildcard vote_*_majority.txt)) $(sort $(wildcard vote_*_majority.src)) \ + $(sort $(wildcard vote_*_results.src)) \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/votebar.wml $(WML) $(<F) -index.$(LANGUAGE).html: index.wml $(wildcard vote_*.wml) \ - $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/../[0-9]*/vote_*.wml) \ +index.$(LANGUAGE).html: index.wml $(sort $(wildcard vote_*.wml)) \ + $(sort $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/../[0-9]*/vote_*.wml)) \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list.wml \ $(TEMPLDIR)/votebar.wml -$(foreach i, $(basename $(wildcard suppl_*_stats.wml)), $(i).$(LANGUAGE).html): \ -%.$(LANGUAGE).html: %.wml $(wildcard vote_*_index.src) +$(foreach i, $(basename $(sort $(wildcard suppl_*_stats.wml))), $(i).$(LANGUAGE).html): \ +%.$(LANGUAGE).html: %.wml $(sort $(wildcard vote_*_index.src)) $(WML) $(<F) ifeq "$(LANGUAGE)" "en" @@ -64,7 +64,7 @@ cleandest:: endif check: - for i in $(wildcard *.$(LANGUAGE).html); do \ + for i in $(sort $(wildcard *.$(LANGUAGE).html)); do \ echo $$i; \ onsgmls -e -g -s -u /usr/share/sgml/declaration/html.decl $$i; \ echo $$i done; \ diff --git a/english/vote/2007/platforms/Makefile b/english/vote/2007/platforms/Makefile index e123f7a76e2..5e63c882cbe 100644 --- a/english/vote/2007/platforms/Makefile +++ b/english/vote/2007/platforms/Makefile @@ -8,5 +8,5 @@ SUBS= include $(WMLBASE)/Make.lang index.$(LANGUAGE).html: index.wml \ - $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/../../[0-9]*/vote_*.wml) \ + $(sort $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/../../[0-9]*/vote_*.wml)) \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/votebar.wml diff --git a/english/vote/2008/Makefile b/english/vote/2008/Makefile index 8c7288a8022..d4e53800ac0 100644 --- a/english/vote/2008/Makefile +++ b/english/vote/2008/Makefile @@ -4,25 +4,25 @@ WMLBASE=../.. CUR_DIR=vote/2008 SUBS=platforms -VOTE=$(basename $(wildcard vote_*.wml)) +VOTE=$(basename $(sort $(wildcard vote_*.wml))) include $(WMLBASE)/Make.lang $(foreach i, $(VOTE), $(i).$(LANGUAGE).html): %.$(LANGUAGE).html: %.wml \ - $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/../[0-9]*/vote_*.wml) \ - $(wildcard vote_*_quorum.txt) $(wildcard vote_*_quorum.src) \ - $(wildcard vote_*_majority.txt) $(wildcard vote_*_majority.src) \ - $(wildcard vote_*_results.src) \ + $(sort $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/../[0-9]*/vote_*.wml)) \ + $(sort $(wildcard vote_*_quorum.txt)) $(sort $(wildcard vote_*_quorum.src)) \ + $(sort $(wildcard vote_*_majority.txt)) $(sort $(wildcard vote_*_majority.src)) \ + $(sort $(wildcard vote_*_results.src)) \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/votebar.wml $(WML) $(<F) -index.$(LANGUAGE).html: index.wml $(wildcard vote_*.wml) \ - $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/../[0-9]*/vote_*.wml) \ +index.$(LANGUAGE).html: index.wml $(sort $(wildcard vote_*.wml)) \ + $(sort $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/../[0-9]*/vote_*.wml)) \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list.wml \ $(TEMPLDIR)/votebar.wml -$(foreach i, $(basename $(wildcard suppl_*_stats.wml)), $(i).$(LANGUAGE).html): \ -%.$(LANGUAGE).html: %.wml $(wildcard vote_*_index.src) +$(foreach i, $(basename $(sort $(wildcard suppl_*_stats.wml))), $(i).$(LANGUAGE).html): \ +%.$(LANGUAGE).html: %.wml $(sort $(wildcard vote_*_index.src)) $(WML) $(<F) ifeq "$(LANGUAGE)" "en" @@ -67,7 +67,7 @@ cleandest:: endif check: - for i in $(wildcard *.$(LANGUAGE).html); do \ + for i in $(sort $(wildcard *.$(LANGUAGE).html)); do \ echo $$i; \ onsgmls -e -g -s -u /usr/share/sgml/declaration/html.decl $$i; \ echo $$i done; \ diff --git a/english/vote/2008/platforms/Makefile b/english/vote/2008/platforms/Makefile index 106246aa997..890ab7cdda9 100644 --- a/english/vote/2008/platforms/Makefile +++ b/english/vote/2008/platforms/Makefile @@ -8,5 +8,5 @@ SUBS= include $(WMLBASE)/Make.lang index.$(LANGUAGE).html: index.wml \ - $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/../../[0-9]*/vote_*.wml) \ + $(sort $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/../../[0-9]*/vote_*.wml)) \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/votebar.wml diff --git a/english/vote/2009/Makefile b/english/vote/2009/Makefile index c2598553358..4e04c5749f9 100644 --- a/english/vote/2009/Makefile +++ b/english/vote/2009/Makefile @@ -4,25 +4,25 @@ WMLBASE=../.. CUR_DIR=vote/2009 SUBS=platforms -VOTE=$(basename $(wildcard vote_*.wml)) +VOTE=$(basename $(sort $(wildcard vote_*.wml))) include $(WMLBASE)/Make.lang $(foreach i, $(VOTE), $(i).$(LANGUAGE).html): %.$(LANGUAGE).html: %.wml \ - $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/../[0-9]*/vote_*.wml) \ - $(wildcard vote_*_quorum.txt) $(wildcard vote_*_quorum.src) \ - $(wildcard vote_*_majority.txt) $(wildcard vote_*_majority.src) \ - $(wildcard vote_*_results.src) \ + $(sort $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/../[0-9]*/vote_*.wml)) \ + $(sort $(wildcard vote_*_quorum.txt)) $(sort $(wildcard vote_*_quorum.src)) \ + $(sort $(wildcard vote_*_majority.txt)) $(sort $(wildcard vote_*_majority.src)) \ + $(sort $(wildcard vote_*_results.src)) \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/votebar.wml $(WML) $(<F) -index.$(LANGUAGE).html: index.wml $(wildcard vote_*.wml) \ - $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/../[0-9]*/vote_*.wml) \ +index.$(LANGUAGE).html: index.wml $(sort $(wildcard vote_*.wml)) \ + $(sort $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/../[0-9]*/vote_*.wml)) \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list.wml \ $(TEMPLDIR)/votebar.wml -$(foreach i, $(basename $(wildcard suppl_*_stats.wml)), $(i).$(LANGUAGE).html): \ -%.$(LANGUAGE).html: %.wml $(wildcard vote_*_index.src) +$(foreach i, $(basename $(sort $(wildcard suppl_*_stats.wml))), $(i).$(LANGUAGE).html): \ +%.$(LANGUAGE).html: %.wml $(sort $(wildcard vote_*_index.src)) $(WML) $(<F) ifeq "$(LANGUAGE)" "en" @@ -68,7 +68,7 @@ cleandest:: endif check: - for i in $(wildcard *.$(LANGUAGE).html); do \ + for i in $(sort $(wildcard *.$(LANGUAGE).html)); do \ echo $$i; \ onsgmls -e -g -s -u /usr/share/sgml/declaration/html.decl $$i; \ echo $$i done; \ diff --git a/english/vote/2009/platforms/Makefile b/english/vote/2009/platforms/Makefile index 4790b37af3a..c076abc3df3 100644 --- a/english/vote/2009/platforms/Makefile +++ b/english/vote/2009/platforms/Makefile @@ -8,5 +8,5 @@ SUBS= include $(WMLBASE)/Make.lang index.$(LANGUAGE).html: index.wml \ - $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/../../[0-9]*/vote_*.wml) \ + $(sort $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/../../[0-9]*/vote_*.wml)) \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/votebar.wml diff --git a/english/vote/2010/Makefile b/english/vote/2010/Makefile index 581df088cff..0c49e53b9da 100644 --- a/english/vote/2010/Makefile +++ b/english/vote/2010/Makefile @@ -4,25 +4,25 @@ WMLBASE=../.. CUR_DIR=vote/2010 SUBS=platforms -VOTE=$(basename $(wildcard vote_*.wml)) +VOTE=$(basename $(sort $(wildcard vote_*.wml))) include $(WMLBASE)/Make.lang $(foreach i, $(VOTE), $(i).$(LANGUAGE).html): %.$(LANGUAGE).html: %.wml \ - $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/../[0-9]*/vote_*.wml) \ - $(wildcard vote_*_quorum.txt) $(wildcard vote_*_quorum.src) \ - $(wildcard vote_*_majority.txt) $(wildcard vote_*_majority.src) \ - $(wildcard vote_*_results.src) \ + $(sort $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/../[0-9]*/vote_*.wml)) \ + $(sort $(wildcard vote_*_quorum.txt)) $(sort $(wildcard vote_*_quorum.src)) \ + $(sort $(wildcard vote_*_majority.txt)) $(sort $(wildcard vote_*_majority.src)) \ + $(sort $(wildcard vote_*_results.src)) \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/votebar.wml $(WML) $(<F) -index.$(LANGUAGE).html: index.wml $(wildcard vote_*.wml) \ - $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/../[0-9]*/vote_*.wml) \ +index.$(LANGUAGE).html: index.wml $(sort $(wildcard vote_*.wml)) \ + $(sort $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/../[0-9]*/vote_*.wml)) \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list.wml \ $(TEMPLDIR)/votebar.wml -$(foreach i, $(basename $(wildcard suppl_*_stats.wml)), $(i).$(LANGUAGE).html): \ -%.$(LANGUAGE).html: %.wml $(wildcard vote_*_index.src) +$(foreach i, $(basename $(sort $(wildcard suppl_*_stats.wml))), $(i).$(LANGUAGE).html): \ +%.$(LANGUAGE).html: %.wml $(sort $(wildcard vote_*_index.src)) $(WML) $(<F) ifeq "$(LANGUAGE)" "en" @@ -69,7 +69,7 @@ cleandest:: endif check: - for i in $(wildcard *.$(LANGUAGE).html); do \ + for i in $(sort $(wildcard *.$(LANGUAGE).html)); do \ echo $$i; \ onsgmls -e -g -s -u /usr/share/sgml/declaration/html.decl $$i; \ echo $$i done; \ diff --git a/english/vote/2010/platforms/Makefile b/english/vote/2010/platforms/Makefile index 6c2544c24a6..fcabe701e4d 100644 --- a/english/vote/2010/platforms/Makefile +++ b/english/vote/2010/platforms/Makefile @@ -8,5 +8,5 @@ SUBS= include $(WMLBASE)/Make.lang index.$(LANGUAGE).html: index.wml \ - $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/../../[0-9]*/vote_*.wml) \ + $(sort $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/../../[0-9]*/vote_*.wml)) \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/votebar.wml diff --git a/english/vote/2011/Makefile b/english/vote/2011/Makefile index 0ca7fc31dca..e7bae054f3c 100644 --- a/english/vote/2011/Makefile +++ b/english/vote/2011/Makefile @@ -4,25 +4,25 @@ WMLBASE=../.. CUR_DIR=vote/2011 SUBS=platforms -VOTE=$(basename $(wildcard vote_*.wml)) +VOTE=$(basename $(sort $(wildcard vote_*.wml))) include $(WMLBASE)/Make.lang $(foreach i, $(VOTE), $(i).$(LANGUAGE).html): %.$(LANGUAGE).html: %.wml \ - $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/../[0-9]*/vote_*.wml) \ - $(wildcard vote_*_quorum.txt) $(wildcard vote_*_quorum.src) \ - $(wildcard vote_*_majority.txt) $(wildcard vote_*_majority.src) \ - $(wildcard vote_*_results.src) \ + $(sort $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/../[0-9]*/vote_*.wml)) \ + $(sort $(wildcard vote_*_quorum.txt)) $(sort $(wildcard vote_*_quorum.src)) \ + $(sort $(wildcard vote_*_majority.txt)) $(sort $(wildcard vote_*_majority.src)) \ + $(sort $(wildcard vote_*_results.src)) \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/votebar.wml $(WML) $(<F) -index.$(LANGUAGE).html: index.wml $(wildcard vote_*.wml) \ - $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/../[0-9]*/vote_*.wml) \ +index.$(LANGUAGE).html: index.wml $(sort $(wildcard vote_*.wml)) \ + $(sort $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/../[0-9]*/vote_*.wml)) \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list.wml \ $(TEMPLDIR)/votebar.wml -$(foreach i, $(basename $(wildcard suppl_*_stats.wml)), $(i).$(LANGUAGE).html): \ -%.$(LANGUAGE).html: %.wml $(wildcard vote_*_index.src) +$(foreach i, $(basename $(sort $(wildcard suppl_*_stats.wml))), $(i).$(LANGUAGE).html): \ +%.$(LANGUAGE).html: %.wml $(sort $(wildcard vote_*_index.src)) $(WML) $(<F) ifeq "$(LANGUAGE)" "en" @@ -69,7 +69,7 @@ cleandest:: endif check: - for i in $(wildcard *.$(LANGUAGE).html); do \ + for i in $(sort $(wildcard *.$(LANGUAGE).html)); do \ echo $$i; \ onsgmls -e -g -s -u /usr/share/sgml/declaration/html.decl $$i; \ echo $$i done; \ diff --git a/english/vote/2011/platforms/Makefile b/english/vote/2011/platforms/Makefile index cc1ac9004ba..6b76628b0ee 100644 --- a/english/vote/2011/platforms/Makefile +++ b/english/vote/2011/platforms/Makefile @@ -8,5 +8,5 @@ SUBS= include $(WMLBASE)/Make.lang index.$(LANGUAGE).html: index.wml \ - $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/../../[0-9]*/vote_*.wml) \ + $(sort $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/../../[0-9]*/vote_*.wml)) \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/votebar.wml diff --git a/english/vote/2012/Makefile b/english/vote/2012/Makefile index 0183ecc474f..94decf75ed8 100644 --- a/english/vote/2012/Makefile +++ b/english/vote/2012/Makefile @@ -4,25 +4,25 @@ WMLBASE=../.. CUR_DIR=vote/2012 SUBS=platforms -VOTE=$(basename $(wildcard vote_*.wml)) +VOTE=$(basename $(sort $(wildcard vote_*.wml))) include $(WMLBASE)/Make.lang $(foreach i, $(VOTE), $(i).$(LANGUAGE).html): %.$(LANGUAGE).html: %.wml \ - $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/../[0-9]*/vote_*.wml) \ - $(wildcard vote_*_quorum.txt) $(wildcard vote_*_quorum.src) \ - $(wildcard vote_*_majority.txt) $(wildcard vote_*_majority.src) \ - $(wildcard vote_*_results.src) \ + $(sort $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/../[0-9]*/vote_*.wml)) \ + $(sort $(wildcard vote_*_quorum.txt)) $(sort $(wildcard vote_*_quorum.src)) \ + $(sort $(wildcard vote_*_majority.txt)) $(sort $(wildcard vote_*_majority.src)) \ + $(sort $(wildcard vote_*_results.src)) \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/votebar.wml $(WML) $(<F) -index.$(LANGUAGE).html: index.wml $(wildcard vote_*.wml) \ - $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/../[0-9]*/vote_*.wml) \ +index.$(LANGUAGE).html: index.wml $(sort $(wildcard vote_*.wml)) \ + $(sort $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/../[0-9]*/vote_*.wml)) \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list.wml \ $(TEMPLDIR)/votebar.wml -$(foreach i, $(basename $(wildcard suppl_*_stats.wml)), $(i).$(LANGUAGE).html): \ -%.$(LANGUAGE).html: %.wml $(wildcard vote_*_index.src) +$(foreach i, $(basename $(sort $(wildcard suppl_*_stats.wml))), $(i).$(LANGUAGE).html): \ +%.$(LANGUAGE).html: %.wml $(sort $(wildcard vote_*_index.src)) $(WML) $(<F) ifeq "$(LANGUAGE)" "en" @@ -69,7 +69,7 @@ cleandest:: endif check: - for i in $(wildcard *.$(LANGUAGE).html); do \ + for i in $(sort $(wildcard *.$(LANGUAGE).html)); do \ echo $$i; \ onsgmls -e -g -s -u /usr/share/sgml/declaration/html.decl $$i; \ echo $$i done; \ diff --git a/english/vote/2012/platforms/Makefile b/english/vote/2012/platforms/Makefile index 331beb11f5e..b0df2f48ea0 100644 --- a/english/vote/2012/platforms/Makefile +++ b/english/vote/2012/platforms/Makefile @@ -8,5 +8,5 @@ SUBS= include $(WMLBASE)/Make.lang index.$(LANGUAGE).html: index.wml \ - $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/../../[0-9]*/vote_*.wml) \ + $(sort $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/../../[0-9]*/vote_*.wml)) \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/votebar.wml diff --git a/english/vote/2013/Makefile b/english/vote/2013/Makefile index 72f0cf77440..9e8c06223b2 100644 --- a/english/vote/2013/Makefile +++ b/english/vote/2013/Makefile @@ -4,25 +4,25 @@ WMLBASE=../.. CUR_DIR=vote/2013 SUBS=platforms -VOTE=$(basename $(wildcard vote_*.wml)) +VOTE=$(basename $(sort $(wildcard vote_*.wml))) include $(WMLBASE)/Make.lang $(foreach i, $(VOTE), $(i).$(LANGUAGE).html): %.$(LANGUAGE).html: %.wml \ - $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/../[0-9]*/vote_*.wml) \ - $(wildcard vote_*_quorum.txt) $(wildcard vote_*_quorum.src) \ - $(wildcard vote_*_majority.txt) $(wildcard vote_*_majority.src) \ - $(wildcard vote_*_results.src) \ + $(sort $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/../[0-9]*/vote_*.wml)) \ + $(sort $(wildcard vote_*_quorum.txt)) $(sort $(wildcard vote_*_quorum.src)) \ + $(sort $(wildcard vote_*_majority.txt)) $(sort $(wildcard vote_*_majority.src)) \ + $(sort $(wildcard vote_*_results.src)) \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/votebar.wml $(WML) $(<F) -index.$(LANGUAGE).html: index.wml $(wildcard vote_*.wml) \ - $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/../[0-9]*/vote_*.wml) \ +index.$(LANGUAGE).html: index.wml $(sort $(wildcard vote_*.wml)) \ + $(sort $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/../[0-9]*/vote_*.wml)) \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list.wml \ $(TEMPLDIR)/votebar.wml -$(foreach i, $(basename $(wildcard suppl_*_stats.wml)), $(i).$(LANGUAGE).html): \ -%.$(LANGUAGE).html: %.wml $(wildcard vote_*_index.src) +$(foreach i, $(basename $(sort $(wildcard suppl_*_stats.wml))), $(i).$(LANGUAGE).html): \ +%.$(LANGUAGE).html: %.wml $(sort $(wildcard vote_*_index.src)) $(WML) $(<F) ifeq "$(LANGUAGE)" "en" @@ -69,7 +69,7 @@ cleandest:: endif check: - for i in $(wildcard *.$(LANGUAGE).html); do \ + for i in $(sort $(wildcard *.$(LANGUAGE).html)); do \ echo $$i; \ onsgmls -e -g -s -u /usr/share/sgml/declaration/html.decl $$i; \ echo $$i done; \ diff --git a/english/vote/2013/platforms/Makefile b/english/vote/2013/platforms/Makefile index 076d7f19b87..5ae8c4adb52 100644 --- a/english/vote/2013/platforms/Makefile +++ b/english/vote/2013/platforms/Makefile @@ -8,5 +8,5 @@ SUBS= include $(WMLBASE)/Make.lang index.$(LANGUAGE).html: index.wml \ - $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/../../[0-9]*/vote_*.wml) \ + $(sort $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/../../[0-9]*/vote_*.wml)) \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/votebar.wml diff --git a/english/vote/2014/Makefile b/english/vote/2014/Makefile index c5d78a67b2f..ba7ef17b19e 100644 --- a/english/vote/2014/Makefile +++ b/english/vote/2014/Makefile @@ -4,25 +4,25 @@ WMLBASE=../.. CUR_DIR=vote/2014 SUBS=platforms -VOTE=$(basename $(wildcard vote_*.wml)) +VOTE=$(basename $(sort $(wildcard vote_*.wml))) include $(WMLBASE)/Make.lang $(foreach i, $(VOTE), $(i).$(LANGUAGE).html): %.$(LANGUAGE).html: %.wml \ - $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/../[0-9]*/vote_*.wml) \ - $(wildcard vote_*_quorum.txt) $(wildcard vote_*_quorum.src) \ - $(wildcard vote_*_majority.txt) $(wildcard vote_*_majority.src) \ - $(wildcard vote_*_results.src) \ + $(sort $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/../[0-9]*/vote_*.wml)) \ + $(sort $(wildcard vote_*_quorum.txt)) $(sort $(wildcard vote_*_quorum.src)) \ + $(sort $(wildcard vote_*_majority.txt)) $(sort $(wildcard vote_*_majority.src)) \ + $(sort $(wildcard vote_*_results.src)) \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/votebar.wml $(WML) $(<F) -index.$(LANGUAGE).html: index.wml $(wildcard vote_*.wml) \ - $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/../[0-9]*/vote_*.wml) \ +index.$(LANGUAGE).html: index.wml $(sort $(wildcard vote_*.wml)) \ + $(sort $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/../[0-9]*/vote_*.wml)) \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list.wml \ $(TEMPLDIR)/votebar.wml -$(foreach i, $(basename $(wildcard suppl_*_stats.wml)), $(i).$(LANGUAGE).html): \ -%.$(LANGUAGE).html: %.wml $(wildcard vote_*_index.src) +$(foreach i, $(basename $(sort $(wildcard suppl_*_stats.wml))), $(i).$(LANGUAGE).html): \ +%.$(LANGUAGE).html: %.wml $(sort $(wildcard vote_*_index.src)) $(WML) $(<F) ifeq "$(LANGUAGE)" "en" @@ -69,7 +69,7 @@ cleandest:: endif check: - for i in $(wildcard *.$(LANGUAGE).html); do \ + for i in $(sort $(wildcard *.$(LANGUAGE).html)); do \ echo $$i; \ onsgmls -e -g -s -u /usr/share/sgml/declaration/html.decl $$i; \ echo $$i done; \ diff --git a/english/vote/2014/platforms/Makefile b/english/vote/2014/platforms/Makefile index 781464e8089..81249b7e32c 100644 --- a/english/vote/2014/platforms/Makefile +++ b/english/vote/2014/platforms/Makefile @@ -8,5 +8,5 @@ SUBS= include $(WMLBASE)/Make.lang index.$(LANGUAGE).html: index.wml \ - $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/../../[0-9]*/vote_*.wml) \ + $(sort $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/../../[0-9]*/vote_*.wml)) \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/votebar.wml diff --git a/english/vote/2015/Makefile b/english/vote/2015/Makefile index b13ac05972f..02886e508bc 100644 --- a/english/vote/2015/Makefile +++ b/english/vote/2015/Makefile @@ -4,25 +4,25 @@ WMLBASE=../.. CUR_DIR=vote/2015 SUBS=platforms -VOTE=$(basename $(wildcard vote_*.wml)) +VOTE=$(basename $(sort $(wildcard vote_*.wml))) include $(WMLBASE)/Make.lang $(foreach i, $(VOTE), $(i).$(LANGUAGE).html): %.$(LANGUAGE).html: %.wml \ - $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/../[0-9]*/vote_*.wml) \ - $(wildcard vote_*_quorum.txt) $(wildcard vote_*_quorum.src) \ - $(wildcard vote_*_majority.txt) $(wildcard vote_*_majority.src) \ - $(wildcard vote_*_results.src) \ + $(sort $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/../[0-9]*/vote_*.wml)) \ + $(sort $(wildcard vote_*_quorum.txt)) $(sort $(wildcard vote_*_quorum.src)) \ + $(sort $(wildcard vote_*_majority.txt)) $(sort $(wildcard vote_*_majority.src)) \ + $(sort $(wildcard vote_*_results.src)) \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/votebar.wml $(WML) $(<F) -index.$(LANGUAGE).html: index.wml $(wildcard vote_*.wml) \ - $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/../[0-9]*/vote_*.wml) \ +index.$(LANGUAGE).html: index.wml $(sort $(wildcard vote_*.wml)) \ + $(sort $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/../[0-9]*/vote_*.wml)) \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list.wml \ $(TEMPLDIR)/votebar.wml -$(foreach i, $(basename $(wildcard suppl_*_stats.wml)), $(i).$(LANGUAGE).html): \ -%.$(LANGUAGE).html: %.wml $(wildcard vote_*_index.src) +$(foreach i, $(basename $(sort $(wildcard suppl_*_stats.wml))), $(i).$(LANGUAGE).html): \ +%.$(LANGUAGE).html: %.wml $(sort $(wildcard vote_*_index.src)) $(WML) $(<F) ifeq "$(LANGUAGE)" "en" @@ -63,7 +63,7 @@ cleandest:: endif check: - for i in $(wildcard *.$(LANGUAGE).html); do \ + for i in $(sort $(wildcard *.$(LANGUAGE).html)); do \ echo $$i; \ onsgmls -e -g -s -u /usr/share/sgml/declaration/html.decl $$i; \ echo $$i done; \ diff --git a/english/vote/2015/platforms/Makefile b/english/vote/2015/platforms/Makefile index 1435732f5d0..e19ff14f1f2 100644 --- a/english/vote/2015/platforms/Makefile +++ b/english/vote/2015/platforms/Makefile @@ -8,5 +8,5 @@ SUBS= include $(WMLBASE)/Make.lang index.$(LANGUAGE).html: index.wml \ - $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/../../[0-9]*/vote_*.wml) \ + $(sort $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/../../[0-9]*/vote_*.wml)) \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/votebar.wml diff --git a/english/vote/2016/Makefile b/english/vote/2016/Makefile index ab415fa5845..291c7032e2f 100644 --- a/english/vote/2016/Makefile +++ b/english/vote/2016/Makefile @@ -4,25 +4,25 @@ WMLBASE=../.. CUR_DIR=vote/2016 SUBS=platforms -VOTE=$(basename $(wildcard vote_*.wml)) +VOTE=$(basename $(sort $(wildcard vote_*.wml))) include $(WMLBASE)/Make.lang $(foreach i, $(VOTE), $(i).$(LANGUAGE).html): %.$(LANGUAGE).html: %.wml \ - $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/../[0-9]*/vote_*.wml) \ - $(wildcard vote_*_quorum.txt) $(wildcard vote_*_quorum.src) \ - $(wildcard vote_*_majority.txt) $(wildcard vote_*_majority.src) \ - $(wildcard vote_*_results.src) \ + $(sort $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/../[0-9]*/vote_*.wml)) \ + $(sort $(wildcard vote_*_quorum.txt)) $(sort $(wildcard vote_*_quorum.src)) \ + $(sort $(wildcard vote_*_majority.txt)) $(sort $(wildcard vote_*_majority.src)) \ + $(sort $(wildcard vote_*_results.src)) \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/votebar.wml $(WML) $(<F) -index.$(LANGUAGE).html: index.wml $(wildcard vote_*.wml) \ - $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/../[0-9]*/vote_*.wml) \ +index.$(LANGUAGE).html: index.wml $(sort $(wildcard vote_*.wml)) \ + $(sort $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/../[0-9]*/vote_*.wml)) \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list.wml \ $(TEMPLDIR)/votebar.wml -$(foreach i, $(basename $(wildcard suppl_*_stats.wml)), $(i).$(LANGUAGE).html): \ -%.$(LANGUAGE).html: %.wml $(wildcard vote_*_index.src) +$(foreach i, $(basename $(sort $(wildcard suppl_*_stats.wml))), $(i).$(LANGUAGE).html): \ +%.$(LANGUAGE).html: %.wml $(sort $(wildcard vote_*_index.src)) $(WML) $(<F) ifeq "$(LANGUAGE)" "en" @@ -68,7 +68,7 @@ cleandest:: endif check: - for i in $(wildcard *.$(LANGUAGE).html); do \ + for i in $(sort $(wildcard *.$(LANGUAGE).html)); do \ echo $$i; \ onsgmls -e -g -s -u /usr/share/sgml/declaration/html.decl $$i; \ echo $$i done; \ diff --git a/english/vote/2016/platforms/Makefile b/english/vote/2016/platforms/Makefile index e099c2b60aa..72d0fcc20a0 100644 --- a/english/vote/2016/platforms/Makefile +++ b/english/vote/2016/platforms/Makefile @@ -8,5 +8,5 @@ SUBS= include $(WMLBASE)/Make.lang index.$(LANGUAGE).html: index.wml \ - $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/../../[0-9]*/vote_*.wml) \ + $(sort $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/../../[0-9]*/vote_*.wml)) \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/votebar.wml diff --git a/english/vote/2017/Makefile b/english/vote/2017/Makefile index cdc170e1675..47e27ad07a6 100644 --- a/english/vote/2017/Makefile +++ b/english/vote/2017/Makefile @@ -4,25 +4,25 @@ WMLBASE=../.. CUR_DIR=vote/2017 SUBS=platforms -VOTE=$(basename $(wildcard vote_*.wml)) +VOTE=$(basename $(sort $(wildcard vote_*.wml))) include $(WMLBASE)/Make.lang $(foreach i, $(VOTE), $(i).$(LANGUAGE).html): %.$(LANGUAGE).html: %.wml \ - $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/../[0-9]*/vote_*.wml) \ - $(wildcard vote_*_quorum.txt) $(wildcard vote_*_quorum.src) \ - $(wildcard vote_*_majority.txt) $(wildcard vote_*_majority.src) \ - $(wildcard vote_*_results.src) \ + $(sort $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/../[0-9]*/vote_*.wml)) \ + $(sort $(wildcard vote_*_quorum.txt)) $(sort $(wildcard vote_*_quorum.src)) \ + $(sort $(wildcard vote_*_majority.txt)) $(sort $(wildcard vote_*_majority.src)) \ + $(sort $(wildcard vote_*_results.src)) \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/votebar.wml $(WML) $(<F) -index.$(LANGUAGE).html: index.wml $(wildcard vote_*.wml) \ - $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/../[0-9]*/vote_*.wml) \ +index.$(LANGUAGE).html: index.wml $(sort $(wildcard vote_*.wml)) \ + $(sort $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/../[0-9]*/vote_*.wml)) \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list.wml \ $(TEMPLDIR)/votebar.wml -$(foreach i, $(basename $(wildcard suppl_*_stats.wml)), $(i).$(LANGUAGE).html): \ -%.$(LANGUAGE).html: %.wml $(wildcard vote_*_index.src) +$(foreach i, $(basename $(sort $(wildcard suppl_*_stats.wml))), $(i).$(LANGUAGE).html): \ +%.$(LANGUAGE).html: %.wml $(sort $(wildcard vote_*_index.src)) $(WML) $(<F) ifeq "$(LANGUAGE)" "en" @@ -68,7 +68,7 @@ cleandest:: endif check: - for i in $(wildcard *.$(LANGUAGE).html); do \ + for i in $(sort $(wildcard *.$(LANGUAGE).html)); do \ echo $$i; \ onsgmls -e -g -s -u /usr/share/sgml/declaration/html.decl $$i; \ echo $$i done; \ diff --git a/english/vote/2017/platforms/Makefile b/english/vote/2017/platforms/Makefile index a85135285ee..a0ef582fd5e 100644 --- a/english/vote/2017/platforms/Makefile +++ b/english/vote/2017/platforms/Makefile @@ -8,5 +8,5 @@ SUBS= include $(WMLBASE)/Make.lang index.$(LANGUAGE).html: index.wml \ - $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/../../[0-9]*/vote_*.wml) \ + $(sort $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/../../[0-9]*/vote_*.wml)) \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/votebar.wml diff --git a/english/vote/2018/Makefile b/english/vote/2018/Makefile index 40400871fa9..e4c377b1ae3 100644 --- a/english/vote/2018/Makefile +++ b/english/vote/2018/Makefile @@ -4,25 +4,25 @@ WMLBASE=../.. CUR_DIR=vote/2018 SUBS=platforms -VOTE=$(basename $(wildcard vote_*.wml)) +VOTE=$(basename $(sort $(wildcard vote_*.wml))) include $(WMLBASE)/Make.lang $(foreach i, $(VOTE), $(i).$(LANGUAGE).html): %.$(LANGUAGE).html: %.wml \ - $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/../[0-9]*/vote_*.wml) \ - $(wildcard vote_*_quorum.txt) $(wildcard vote_*_quorum.src) \ - $(wildcard vote_*_majority.txt) $(wildcard vote_*_majority.src) \ - $(wildcard vote_*_results.src) \ + $(sort $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/../[0-9]*/vote_*.wml)) \ + $(sort $(wildcard vote_*_quorum.txt)) $(sort $(wildcard vote_*_quorum.src)) \ + $(sort $(wildcard vote_*_majority.txt)) $(sort $(wildcard vote_*_majority.src)) \ + $(sort $(wildcard vote_*_results.src)) \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/votebar.wml $(WML) $(<F) -index.$(LANGUAGE).html: index.wml $(wildcard vote_*.wml) \ - $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/../[0-9]*/vote_*.wml) \ +index.$(LANGUAGE).html: index.wml $(sort $(wildcard vote_*.wml)) \ + $(sort $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/../[0-9]*/vote_*.wml)) \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list.wml \ $(TEMPLDIR)/votebar.wml -$(foreach i, $(basename $(wildcard suppl_*_stats.wml)), $(i).$(LANGUAGE).html): \ -%.$(LANGUAGE).html: %.wml $(wildcard vote_*_index.src) +$(foreach i, $(basename $(sort $(wildcard suppl_*_stats.wml))), $(i).$(LANGUAGE).html): \ +%.$(LANGUAGE).html: %.wml $(sort $(wildcard vote_*_index.src)) $(WML) $(<F) ifeq "$(LANGUAGE)" "en" @@ -68,7 +68,7 @@ cleandest:: endif check: - for i in $(wildcard *.$(LANGUAGE).html); do \ + for i in $(sort $(wildcard *.$(LANGUAGE).html)); do \ echo $$i; \ onsgmls -e -g -s -u /usr/share/sgml/declaration/html.decl $$i; \ echo $$i done; \ diff --git a/english/vote/2018/platforms/Makefile b/english/vote/2018/platforms/Makefile index bb1ce33c319..f5481de4d6f 100644 --- a/english/vote/2018/platforms/Makefile +++ b/english/vote/2018/platforms/Makefile @@ -8,5 +8,5 @@ SUBS= include $(WMLBASE)/Make.lang index.$(LANGUAGE).html: index.wml \ - $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/../../[0-9]*/vote_*.wml) \ + $(sort $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/../../[0-9]*/vote_*.wml)) \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/votebar.wml diff --git a/english/vote/2019/Makefile b/english/vote/2019/Makefile index beea9a83249..8f6d1afa5f0 100644 --- a/english/vote/2019/Makefile +++ b/english/vote/2019/Makefile @@ -4,25 +4,25 @@ WMLBASE=../.. CUR_DIR=vote/2019 SUBS=platforms -VOTE=$(basename $(wildcard vote_*.wml)) +VOTE=$(basename $(sort $(wildcard vote_*.wml))) include $(WMLBASE)/Make.lang $(foreach i, $(VOTE), $(i).$(LANGUAGE).html): %.$(LANGUAGE).html: %.wml \ - $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/../[0-9]*/vote_*.wml) \ - $(wildcard vote_*_quorum.txt) $(wildcard vote_*_quorum.src) \ - $(wildcard vote_*_majority.txt) $(wildcard vote_*_majority.src) \ - $(wildcard vote_*_results.src) \ + $(sort $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/../[0-9]*/vote_*.wml)) \ + $(sort $(wildcard vote_*_quorum.txt)) $(sort $(wildcard vote_*_quorum.src)) \ + $(sort $(wildcard vote_*_majority.txt)) $(sort $(wildcard vote_*_majority.src)) \ + $(sort $(wildcard vote_*_results.src)) \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/votebar.wml $(WML) $(<F) -index.$(LANGUAGE).html: index.wml $(wildcard vote_*.wml) \ - $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/../[0-9]*/vote_*.wml) \ +index.$(LANGUAGE).html: index.wml $(sort $(wildcard vote_*.wml)) \ + $(sort $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/../[0-9]*/vote_*.wml)) \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list.wml \ $(TEMPLDIR)/votebar.wml -$(foreach i, $(basename $(wildcard suppl_*_stats.wml)), $(i).$(LANGUAGE).html): \ -%.$(LANGUAGE).html: %.wml $(wildcard vote_*_index.src) +$(foreach i, $(basename $(sort $(wildcard suppl_*_stats.wml))), $(i).$(LANGUAGE).html): \ +%.$(LANGUAGE).html: %.wml $(sort $(wildcard vote_*_index.src)) $(WML) $(<F) ifeq "$(LANGUAGE)" "en" @@ -68,7 +68,7 @@ cleandest:: endif check: - for i in $(wildcard *.$(LANGUAGE).html); do \ + for i in $(sort $(wildcard *.$(LANGUAGE).html)); do \ echo $$i; \ onsgmls -e -g -s -u /usr/share/sgml/declaration/html.decl $$i; \ echo $$i done; \ diff --git a/english/vote/Makefile b/english/vote/Makefile index dfd7d2d8522..58a2baf5b69 100644 --- a/english/vote/Makefile +++ b/english/vote/Makefile @@ -3,21 +3,21 @@ WMLBASE=.. CUR_DIR=vote -SUBS=$(wildcard [12][0-9][0-9][0-9]) +SUBS=$(sort $(wildcard [12][0-9][0-9][0-9])) include $(WMLBASE)/Make.lang GETTEXTFILES += vote.mo index.$(LANGUAGE).html: index.wml \ - $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/[0-9]*/vote_*.wml) \ + $(sort $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/[0-9]*/vote_*.wml)) \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/votebar.wml $(GETTEXTDEP) howto_follow.$(LANGUAGE).html: howto_follow.wml \ - $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/[0-9]*/vote_*.wml) \ + $(sort $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/[0-9]*/vote_*.wml)) \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/votebar.wml $(GETTEXTDEP) howto_proposal.$(LANGUAGE).html: howto_proposal.wml \ - $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/[0-9]*/vote_*.wml) \ + $(sort $(wildcard $(ENGLISHSRCDIR)/$(CUR_DIR)/[0-9]*/vote_*.wml)) \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/votebar.wml $(GETTEXTDEP) # howto_result.$(LANGUAGE).html: howto_result.wml \ # $(TEMPLDIR)/basic.wml $(TEMPLDIR)/votebar.wml diff --git a/english/women/profiles/Makefile b/english/women/profiles/Makefile index a68a805a9ca..908dd5bcb91 100644 --- a/english/women/profiles/Makefile +++ b/english/women/profiles/Makefile @@ -4,7 +4,7 @@ WMLBASE=../.. CUR_DIR=women/profiles SUBS=pictures -PROFILES := $(filter-out index.wml, $(wildcard *.wml)) +PROFILES := $(filter-out index.wml, $(sort $(wildcard *.wml))) ## GETTEXTFILES += others.mo NOGENERICDEP := true diff --git a/indonesian/releases/etch/Makefile b/indonesian/releases/etch/Makefile index 276f2fcdd96..da1d53046f6 100644 --- a/indonesian/releases/etch/Makefile +++ b/indonesian/releases/etch/Makefile @@ -12,11 +12,11 @@ index.$(LANGUAGE).html: index.wml $(TEMPLDIR)/release.wml \ releasenotes.$(LANGUAGE).html: releasenotes.wml $(TEMPLDIR)/release.wml \ $(ENGLISHDIR)/releases/etch/release.data $(TEMPLDIR)/release_info.wml \ - $(wildcard $(HTMLDIR)/*/release-notes*) + $(sort $(wildcard $(HTMLDIR)/*/release-notes*)) installmanual.$(LANGUAGE).html: installmanual.wml $(TEMPLDIR)/release.wml \ $(ENGLISHDIR)/releases/etch/release.data $(TEMPLDIR)/release_info.wml \ - $(wildcard $(HTMLDIR)/*/install*) + $(sort $(wildcard $(HTMLDIR)/*/install*)) etchnhalf.$(LANGUAGE).html: etchnhalf.wml $(TEMPLDIR)/release.wml \ $(ENGLISHDIR)/releases/etch/release.data diff --git a/indonesian/releases/jessie/Makefile b/indonesian/releases/jessie/Makefile index 3561d7f9243..35d4c2bc311 100644 --- a/indonesian/releases/jessie/Makefile +++ b/indonesian/releases/jessie/Makefile @@ -12,8 +12,8 @@ index.$(LANGUAGE).html: index.wml $(TEMPLDIR)/release.wml \ releasenotes.$(LANGUAGE).html: releasenotes.wml $(TEMPLDIR)/release.wml \ $(ENGLISHDIR)/releases/jessie/release.data $(TEMPLDIR)/release_info.wml \ - $(wildcard $(HTMLDIR)/*/release-notes*) + $(sort $(wildcard $(HTMLDIR)/*/release-notes*)) installmanual.$(LANGUAGE).html: installmanual.wml $(TEMPLDIR)/release.wml \ $(ENGLISHDIR)/releases/jessie/release.data $(TEMPLDIR)/release_info.wml \ - $(wildcard $(HTMLDIR)/*/install*) + $(sort $(wildcard $(HTMLDIR)/*/install*)) diff --git a/indonesian/releases/wheezy/Makefile b/indonesian/releases/wheezy/Makefile index 76067d7b95e..6b625132fae 100644 --- a/indonesian/releases/wheezy/Makefile +++ b/indonesian/releases/wheezy/Makefile @@ -12,8 +12,8 @@ index.$(LANGUAGE).html: index.wml $(TEMPLDIR)/release.wml \ releasenotes.$(LANGUAGE).html: releasenotes.wml $(TEMPLDIR)/release.wml \ $(ENGLISHDIR)/releases/wheezy/release.data $(TEMPLDIR)/release_info.wml \ - $(wildcard $(HTMLDIR)/*/release-notes*) + $(sort $(wildcard $(HTMLDIR)/*/release-notes*)) installmanual.$(LANGUAGE).html: installmanual.wml $(TEMPLDIR)/release.wml \ $(ENGLISHDIR)/releases/wheezy/release.data $(TEMPLDIR)/release_info.wml \ - $(wildcard $(HTMLDIR)/*/install*) + $(sort $(wildcard $(HTMLDIR)/*/install*)) diff --git a/romanian/releases/jessie/Makefile b/romanian/releases/jessie/Makefile index bf2b9e426e7..97835f7df4f 100644 --- a/romanian/releases/jessie/Makefile +++ b/romanian/releases/jessie/Makefile @@ -13,9 +13,9 @@ index.$(LANGUAGE).html: index.wml $(TEMPLDIR)/release.wml \ releasenotes.$(LANGUAGE).html: releasenotes.wml $(TEMPLDIR)/release.wml \ $(ENGLISHDIR)/releases/jessie/release.data $(TEMPLDIR)/release_info.wml \ $(ENGLISHDIR)/releases/arches.data \ - $(wildcard $(HTMLDIR)/*/release-notes*) + $(sort $(wildcard $(HTMLDIR)/*/release-notes*)) installmanual.$(LANGUAGE).html: installmanual.wml $(TEMPLDIR)/release.wml \ $(ENGLISHDIR)/releases/jessie/release.data $(TEMPLDIR)/release_info.wml \ $(ENGLISHDIR)/releases/arches.data \ - $(wildcard $(HTMLDIR)/*/install*) + $(sort $(wildcard $(HTMLDIR)/*/install*)) diff --git a/turkish/releases/lenny/Makefile b/turkish/releases/lenny/Makefile index 603ebad3223..1b2424da6a1 100644 --- a/turkish/releases/lenny/Makefile +++ b/turkish/releases/lenny/Makefile @@ -12,11 +12,11 @@ index.$(LANGUAGE).html: index.wml $(TEMPLDIR)/release.wml \ releasenotes.$(LANGUAGE).html: releasenotes.wml $(TEMPLDIR)/release.wml \ $(ENGLISHDIR)/releases/lenny/release.data $(TEMPLDIR)/release_info.wml \ - $(wildcard $(HTMLDIR)/*/release-notes*) + $(sort $(wildcard $(HTMLDIR)/*/release-notes*)) installmanual.$(LANGUAGE).html: installmanual.wml $(TEMPLDIR)/release.wml \ $(ENGLISHDIR)/releases/lenny/release.data $(TEMPLDIR)/release_info.wml \ - $(wildcard $(HTMLDIR)/*/install*) + $(sort $(wildcard $(HTMLDIR)/*/install*)) $(ENGLISHSRCDIR)/$(CUR_DIR)/release.data: $(TEMPLDIR)/release_images.wml touch $@ |