Commit 1857cd3f authored by Glenn Morris's avatar Glenn Morris

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.
parent 61ac6b9f
2013-08-27 Glenn Morris <rgm@gnu.org>
* 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.
* Makefile.in (mostlyclean, clean, distclean, bootstrap-clean)
(maintainer-clean, check-declare): Remove pointless subshells.
Check cd return value.
......
......@@ -1026,13 +1026,15 @@ info: force-info
fi
# The info/dir file must be updated by hand when new manuals are added.
# Cannot add an info/dir entry for efaq-w32 since it is not installed
# on all platforms.
check-info-dir: info
cd info ; \
missing= ; \
for file in *; do \
test -f "$${file}" || continue ; \
case $${file} in \
*-[0-9]*|COPYING|dir) continue ;; \
*-[0-9]*|COPYING|dir|efaq-w32*) continue ;; \
esac ; \
file=`echo $${file} | sed 's/\.info//'` ; \
grep -q -F ": ($${file})." dir || missing="$${missing} $${file}" ; \
......
2013-08-27 Glenn Morris <rgm@gnu.org>
* admin.el (manual-misc-manuals): Use INFO_COMMON rather than
INFO_TARGETS.
2013-08-15 Glenn Morris <rgm@gnu.org>
* make-tarball.txt: Mention generating pdfs in etc/refcards.
......
......@@ -195,19 +195,21 @@ Root must be the root of an Emacs source tree."
(defun manual-misc-manuals (root)
"Return doc/misc manuals as list of strings."
;; Like `make -C doc/misc echo-info', but works if unconfigured.
;; Similar to `make -C doc/misc echo-info', but works if unconfigured,
;; and for INFO_TARGETS rather than INFO_INSTALL.
(with-temp-buffer
(insert-file-contents (expand-file-name "doc/misc/Makefile.in" root))
(search-forward "INFO_TARGETS = ")
(let ((start (point))
res)
;; Should really use expanded value of INFO_TARGETS.
(search-forward "INFO_COMMON = ")
(let ((start (point)))
(end-of-line)
(while (and (looking-back "\\\\")
(zerop (forward-line 1)))
(end-of-line))
(split-string (replace-regexp-in-string
"\\(\\\\\\|\\.info\\)" ""
(buffer-substring start (point)))))))
(append (split-string (replace-regexp-in-string
"\\(\\\\\\|\\.info\\)" ""
(buffer-substring start (point))))
'("efaq-w32")))))
(defun make-manuals (root &optional type)
"Generate the web manuals for the Emacs webpage.
......
......@@ -997,6 +997,27 @@ INFO_OPTS=--no-split
AC_SUBST(INFO_EXT)
AC_SUBST(INFO_OPTS)
if test $opsys = mingw32; then
DOCMISC_DVI_W32 = efaq-w32.dvi
DOCMISC_HTML_W32 = efaq-w32.html
DOCMISC_INFO_W32 = efaq-w32.info
DOCMISC_PDF_W32 = efaq-w32.pdf
DOCMISC_PS_W32 = efaq-w32.ps
else
DOCMISC_DVI_W32 =
DOCMISC_HTML_W32 =
DOCMISC_INFO_W32 =
DOCMISC_PDF_W32 =
DOCMISC_PS_W32 =
fi
AC_SUBST(DOCMISC_DVI_W32)
AC_SUBST(DOCMISC_HTML_W32)
AC_SUBST(DOCMISC_INFO_W32)
AC_SUBST(DOCMISC_PDF_W32)
AC_SUBST(DOCMISC_PS_W32)
dnl Add our options to ac_link now, after it is set up.
if test x$GCC = xyes; then
......
2013-08-27 Glenn Morris <rgm@gnu.org>
* efaq-w32.texi: Move here from the web-pages repository.
* 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.
2013-08-19 Katsumi Yamaoka <yamaoka@jpl.org>
* emacs-mime.texi (Encoding Customization): Exclude iso-2022-jp-2 and
......
......@@ -59,7 +59,15 @@ INSTALL_DATA = @INSTALL_DATA@
MAKEINFO = @MAKEINFO@
MAKEINFO_OPTS = --force -I$(emacsdir)
INFO_TARGETS = ada-mode auth autotype bovine calc ccmode cl \
## On MS Windows, efaq-w32; otherwise blank.
DOCMISC_DVI_W32 = @DOCMISC_DVI_W32@
DOCMISC_HTML_W32 = @DOCMISC_HTML_W32@
DOCMISC_INFO_W32 = @DOCMISC_INFO_W32@
DOCMISC_PDF_W32 = @DOCMISC_PDF_W32@
DOCMISC_PS_W32 = @DOCMISC_PS_W32@
## Info files to build and install on all platforms.
INFO_COMMON = ada-mode auth autotype bovine calc ccmode cl \
dbus dired-x ebrowse ede ediff edt eieio \
emacs-mime epa erc ert eshell eudc efaq \
flymake forms gnus emacs-gnutls htmlfontify idlwave ido info.info \
......@@ -68,7 +76,15 @@ INFO_TARGETS = ada-mode auth autotype bovine calc ccmode cl \
sc semantic ses sieve smtpmail speedbar srecode todo-mode tramp \
url vip viper widget wisent woman
DVI_TARGETS = \
## Info files to install on current platform.
INFO_INSTALL = $(INFO_COMMON) $(DOCMISC_INFO_W32)
## Info files to build on current platform.
## This is all of them, even though they might not all get installed,
## because the info files are pre-built in release tarfiles.
INFO_TARGETS = $(INFO_COMMON) efaq-w32
DVI_TARGETS = $(DOCMISC_DVI_W32) \
ada-mode.dvi \
auth.dvi \
autotype.dvi \
......@@ -126,7 +142,7 @@ DVI_TARGETS = \
wisent.dvi \
woman.dvi
HTML_TARGETS = \
HTML_TARGETS = $(DOCMISC_HTML_W32) \
ada-mode.html \
auth.html \
autotype.html \
......@@ -184,7 +200,7 @@ HTML_TARGETS = \
wisent.html \
woman.html
PDF_TARGETS = \
PDF_TARGETS = $(DOCMISC_PDF_W32) \
ada-mode.pdf \
auth.pdf \
autotype.pdf \
......@@ -242,7 +258,7 @@ PDF_TARGETS = \
wisent.pdf \
woman.pdf
PS_TARGETS = \
PS_TARGETS = $(DOCMISC_PS_W32) \
ada-mode.ps \
auth.ps \
autotype.ps \
......@@ -326,7 +342,7 @@ info: $(INFO_TARGETS)
## Used by top-level Makefile.
## Base file names of output info files.
echo-info:
@echo "$(INFO_TARGETS) " | \
@echo "$(INFO_INSTALL) " | \
sed -e 's|[^ ]*/||g' -e 's/\.info//g' -e "s/ */$(INFO_EXT) /g"
# please modify this for all the web manual targets
......@@ -612,6 +628,18 @@ faq.pdf: $(faq_deps)
faq.html: $(faq_deps)
$(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/faq.texi
efaq_w32_deps = ${srcdir}/efaq-w32.texi $(emacsdir)/emacsver.texi
efaq-w32 : $(buildinfodir)/efaq-w32$(INFO_EXT)
$(buildinfodir)/efaq-w32$(INFO_EXT): $(efaq_w32_deps)
$(mkinfodir)
$(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/efaq-w32.texi
efaq-w32.dvi: $(efaq_w32_deps)
$(ENVADD) $(TEXI2DVI) ${srcdir}/efaq-w32.texi
efaq-w32.pdf: $(efaq_w32_deps)
$(ENVADD) $(TEXI2PDF) ${srcdir}/efaq-w32.texi
efaq-w32.html: $(efaq_w32_deps)
$(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/efaq-w32.texi
flymake_deps = ${srcdir}/flymake.texi ${gfdl}
flymake : $(buildinfodir)/flymake$(INFO_EXT)
$(buildinfodir)/flymake$(INFO_EXT): $(flymake_deps)
......@@ -1040,6 +1068,7 @@ mostlyclean:
clean: mostlyclean
rm -f $(DVI_TARGETS) $(HTML_TARGETS) $(PDF_TARGETS) $(PS_TARGETS)
rm -f efaq-w32.dvi efaq-w32.html efaq-w32.pdf efaq-w32.ps
rm -f emacs-misc-${version}.tar*
distclean: clean
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment