aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2010-12-02 21:37:55 -0400
committerGravatar Joey Hess <joey@kitenet.net>2010-12-02 21:37:55 -0400
commit6f932a0963341b235f262c43982cc138f443f2de (patch)
tree9d8e474b5b67077a57eff0c4fbdabdafad8ec99e
parent71d60eb87a492a9561f7142cc897ff5961c21e25 (diff)
avoid building news page when building doc wiki for package
-rw-r--r--Makefile3
-rw-r--r--doc/news.mdwn6
2 files changed, 8 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 17918f956..ad143e7b6 100644
--- a/Makefile
+++ b/Makefile
@@ -30,7 +30,8 @@ docs:
$(IKIWIKI) doc html -v --wikiname git-annex --plugin=goodstuff \
--no-usedirs --disable-plugin=openid --plugin=sidebar \
--underlaydir=/dev/null --disable-plugin=shortcut \
- --disable-plugin=smiley
+ --disable-plugin=smiley \
+ --exclude='news/.*'
clean:
rm -rf build git-annex git-annex.1 test configure SysConfig.hs
diff --git a/doc/news.mdwn b/doc/news.mdwn
index d0ff1ca2c..3d9ece3bb 100644
--- a/doc/news.mdwn
+++ b/doc/news.mdwn
@@ -1,5 +1,11 @@
+[[!if test="news/*" then="""
This is where announcements of new releases, features, and other news is
posted. git-annex users are recommended to subscribe to this page's RSS
feed.
[[!inline pages="./news/* and !*/Discussion" rootpage="news" show="30"]]
+
+"""
+else="""
+(Please see the changelog.)
+"""]]