aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--www/Makefile2
-rwxr-xr-xwww/index.sh4
-rw-r--r--www/news/MANIFEST5
3 files changed, 8 insertions, 3 deletions
diff --git a/www/Makefile b/www/Makefile
index 681e3067..bcf230b1 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -16,7 +16,7 @@
MD_MAIN != find -L . -name '*.md' -and ! -path '*/news/*'
HTML_MAIN = $(MD_MAIN:.md=.html)
-MD_NEWS != find -L news -name '*.md' -and ! -name index.md
+MD_NEWS != cat news/MANIFEST
HTML_NEWS = $(MD_NEWS:.md=.html)
diff --git a/www/index.sh b/www/index.sh
index 4d7d2292..618b8fc5 100755
--- a/www/index.sh
+++ b/www/index.sh
@@ -37,13 +37,13 @@ meta() {
# generate the index file
-FILES=$(ls -1 -t news/*.md | sed -e s-.*index.md-- -e s-.*presentation.md--)
+# MANIFEST determines the order of news articles in news/index.md
+FILES=$(cat news/MANIFEST)
cat news-list.md > news/index.md
for f in $FILES
do
- touch -d "$(sed -n 3p $f | sed -e 's/^..//g')" $f
meta >> news/index.md
done
diff --git a/www/news/MANIFEST b/www/news/MANIFEST
new file mode 100644
index 00000000..e5e34cf0
--- /dev/null
+++ b/www/news/MANIFEST
@@ -0,0 +1,5 @@
+news/new-mailing-lists.md
+news/andrew-robbins-new-maintainer.md
+news/formalised-structure.md
+news/proposal-rejoin-gnu.md
+news/unity.md