aboutsummaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
Diffstat (limited to 'admin')
-rw-r--r--admin/ChangeLog5
-rw-r--r--admin/admin.el16
2 files changed, 14 insertions, 7 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog
index e9c6c74e163..f92fa8930b5 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,8 @@
12013-08-27 Glenn Morris <rgm@gnu.org>
2
3 * admin.el (manual-misc-manuals): Use INFO_COMMON rather than
4 INFO_TARGETS.
5
12013-08-15 Glenn Morris <rgm@gnu.org> 62013-08-15 Glenn Morris <rgm@gnu.org>
2 7
3 * make-tarball.txt: Mention generating pdfs in etc/refcards. 8 * make-tarball.txt: Mention generating pdfs in etc/refcards.
diff --git a/admin/admin.el b/admin/admin.el
index 9c0015fc413..875db2948e5 100644
--- a/admin/admin.el
+++ b/admin/admin.el
@@ -195,19 +195,21 @@ Root must be the root of an Emacs source tree."
195 195
196(defun manual-misc-manuals (root) 196(defun manual-misc-manuals (root)
197 "Return doc/misc manuals as list of strings." 197 "Return doc/misc manuals as list of strings."
198 ;; Like `make -C doc/misc echo-info', but works if unconfigured. 198 ;; Similar to `make -C doc/misc echo-info', but works if unconfigured,
199 ;; and for INFO_TARGETS rather than INFO_INSTALL.
199 (with-temp-buffer 200 (with-temp-buffer
200 (insert-file-contents (expand-file-name "doc/misc/Makefile.in" root)) 201 (insert-file-contents (expand-file-name "doc/misc/Makefile.in" root))
201 (search-forward "INFO_TARGETS = ") 202 ;; Should really use expanded value of INFO_TARGETS.
202 (let ((start (point)) 203 (search-forward "INFO_COMMON = ")
203 res) 204 (let ((start (point)))
204 (end-of-line) 205 (end-of-line)
205 (while (and (looking-back "\\\\") 206 (while (and (looking-back "\\\\")
206 (zerop (forward-line 1))) 207 (zerop (forward-line 1)))
207 (end-of-line)) 208 (end-of-line))
208 (split-string (replace-regexp-in-string 209 (append (split-string (replace-regexp-in-string
209 "\\(\\\\\\|\\.info\\)" "" 210 "\\(\\\\\\|\\.info\\)" ""
210 (buffer-substring start (point))))))) 211 (buffer-substring start (point))))
212 '("efaq-w32")))))
211 213
212(defun make-manuals (root &optional type) 214(defun make-manuals (root &optional type)
213 "Generate the web manuals for the Emacs webpage. 215 "Generate the web manuals for the Emacs webpage.