summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorMatthias Klose <doko@ubuntu.com>2007-08-02 21:33:13 (GMT)
committerMatthias Klose <doko@ubuntu.com>2007-08-02 21:33:13 (GMT)
commiteb8ff67fd73b8fa52b5c2d796706a0cd29ba8d71 (patch)
tree1de92666fde35466c7f43c5f8e8cdc558b2d9fc9 /Doc
parent412b8b654cda5aa8abd038ac9cdcb19a0722c563 (diff)
downloadcpython-eb8ff67fd73b8fa52b5c2d796706a0cd29ba8d71.zip
cpython-eb8ff67fd73b8fa52b5c2d796706a0cd29ba8d71.tar.gz
cpython-eb8ff67fd73b8fa52b5c2d796706a0cd29ba8d71.tar.bz2
- Allow Emacs 22 for building the documentation in info format.
Diffstat (limited to 'Doc')
-rw-r--r--Doc/info/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Doc/info/Makefile b/Doc/info/Makefile
index 3dbbd74..a9a037b 100644
--- a/Doc/info/Makefile
+++ b/Doc/info/Makefile
@@ -34,10 +34,10 @@ $(WHATSNEW): python$(VERSION)-$(WHATSNEW).info
check-emacs-version:
@v="`$(EMACS) --version 2>&1 | egrep '^(GNU |X)Emacs [12]*'`"; \
- if `echo "$$v" | grep '^GNU Emacs 21' >/dev/null 2>&1`; then \
+ if `echo "$$v" | grep '^GNU Emacs 2[12]' >/dev/null 2>&1`; then \
echo "Using $(EMACS) to build the info docs"; \
else \
- echo "GNU Emacs 21 is required to build the info docs"; \
+ echo "GNU Emacs 21 or 22 is required to build the info docs"; \
echo "Found $$v"; \
false; \
fi