aboutsummaryrefslogtreecommitdiffstats
path: root/admin/admin.el
diff options
context:
space:
mode:
authorGlenn Morris2013-08-27 00:57:39 -0700
committerGlenn Morris2013-08-27 00:57:39 -0700
commit1857cd3f9ef1103d5ea2fcecbb7b2a6a9d6b2aef (patch)
tree92b9a5563ab6e4a0aa3e530bee29ef98d532c1da /admin/admin.el
parent61ac6b9f821504ce12e0797a1fcf403e951d193b (diff)
downloademacs-1857cd3f9ef1103d5ea2fcecbb7b2a6a9d6b2aef.tar.gz
emacs-1857cd3f9ef1103d5ea2fcecbb7b2a6a9d6b2aef.zip
Move source for Emacs on MS Windows FAQ here from Emacs webpages repository
* Makefile.in (mostlyclean, clean, distclean, bootstrap-clean) (maintainer-clean, check-declare): Remove pointless subshells. Check cd return value. * configure.ac (DOCMISC_DVI_W32, DOCMISC_HTML_W32, DOCMISC_INFO_W32) (DOCMISC_PDF_W32, DOCMISC_PS_W32): New output variables. * Makefile.in (check-info-dir): Ignore efaq-w32. * admin/admin.el (manual-misc-manuals): Use INFO_COMMON rather than INFO_TARGETS. * doc/misc/efaq-w32.texi: Move here from the web-pages repository. * doc/misc/Makefile.in (DOCMISC_DVI_W32, DOCMISC_HTML_W32, DOCMISC_INFO_W32) (DOCMISC_PDF_W32, DOCMISC_PS_W32): New configure output variables. (INFO_COMMON, INFO_INSTALL): New derivations of INFO_TARGETS. (DVI_TARGETS, HTML_TARGETS, PDF_TARGETS, PS_TARGETS): Add DOCMISC_*_W32 variables. (echo-info): Use INFO_INSTALL rather than INFO_TARGETS. (efaq_w32_deps): New variable. (efaq-w32, $(buildinfodir)/efaq-w32$(INFO_EXT), efaq-w32.dvi) (efaq-w32.pdf, efaq-w32.html): New rules. (clean): Remove efaq-w32 products.
Diffstat (limited to 'admin/admin.el')
-rw-r--r--admin/admin.el16
1 files changed, 9 insertions, 7 deletions
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.