procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge from trunk

Browse source
This commit is contained in:
Joakim Verona 2013-08-27 19:32:10 +02:00
commit ebc2ba4f60
5 changed files with 34 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
admin/ChangeLog
View file

@ -1,7 +1,7 @@
2013-08-27 Glenn Morris <rgm@gnu.org>
* admin.el (manual-misc-manuals): Use INFO_COMMON rather than
INFO_TARGETS.
INFO_TARGETS. "faq" does not need special treatment any more.
2013-08-15 Glenn Morris <rgm@gnu.org>

3
admin/admin.el
View file

@ -289,9 +289,8 @@ Optional argument TYPE is type of output (nil means all)."
(defun manual-misc-html (name root html-node-dir html-mono-dir)
;; Hack to deal with the cases where .texi creates a different .info.
;; Blech. TODO Why not just rename the .texi files?
;; Blech. TODO Why not just rename the .texi (or .info) files?
(let* ((texiname (cond ((equal name "ccmode") "cc-mode")
((equal name "efaq") "faq")
(t name)))
(texi (expand-file-name (format "doc/misc/%s.texi" texiname) root)))
(manual-html-node texi (expand-file-name name html-node-dir))

3
doc/misc/ChangeLog
View file

@ -1,5 +1,8 @@
2013-08-27 Glenn Morris <rgm@gnu.org>
* efaq.texi: Rename from faq.texi, to match its output files.
* Makefile.in: Update for faq.texi name change.
* efaq-w32.texi (EMACSVER): Get it from emacsver.texi.
* Makefile.in (webhack): Remove; it's nothing to do with Emacs.

58
doc/misc/Makefile.in
View file

@ -98,6 +98,7 @@ DVI_TARGETS = $(DOCMISC_DVI_W32) \
ede.dvi \
ediff.dvi \
edt.dvi \
efaq.dvi \
eieio.dvi \
emacs-mime.dvi \
epa.dvi \
@ -105,7 +106,6 @@ DVI_TARGETS = $(DOCMISC_DVI_W32) \
ert.dvi \
eshell.dvi \
eudc.dvi \
faq.dvi \
flymake.dvi \
forms.dvi \
gnus.dvi \
@ -156,6 +156,7 @@ HTML_TARGETS = $(DOCMISC_HTML_W32) \
ede.html \
ediff.html \
edt.html \
efaq.html \
eieio.html \
emacs-mime.html \
epa.html \
@ -163,7 +164,6 @@ HTML_TARGETS = $(DOCMISC_HTML_W32) \
ert.html \
eshell.html \
eudc.html \
faq.html \
flymake.html \
forms.html \
gnus.html \
@ -214,6 +214,7 @@ PDF_TARGETS = $(DOCMISC_PDF_W32) \
ede.pdf \
ediff.pdf \
edt.pdf \
efaq.pdf \
eieio.pdf \
emacs-mime.pdf \
epa.pdf \
@ -221,7 +222,6 @@ PDF_TARGETS = $(DOCMISC_PDF_W32) \
ert.pdf \
eshell.pdf \
eudc.pdf \
faq.pdf \
flymake.pdf \
forms.pdf \
gnus.pdf \
@ -272,6 +272,7 @@ PS_TARGETS = $(DOCMISC_PS_W32) \
ede.ps \
ediff.ps \
edt.ps \
efaq.ps \
eieio.ps \
emacs-mime.ps \
epa.ps \
@ -279,7 +280,6 @@ PS_TARGETS = $(DOCMISC_PS_W32) \
ert.ps \
eshell.ps \
eudc.ps \
faq.ps \
flymake.ps \
forms.ps \
gnus.ps \
@ -515,6 +515,31 @@ edt.pdf: $(edt_deps)
edt.html: $(edt_deps)
$(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/edt.texi
## No gfdl dependency.
efaq_deps = ${srcdir}/efaq.texi $(emacsdir)/emacsver.texi
efaq : $(buildinfodir)/efaq$(INFO_EXT)
$(buildinfodir)/efaq$(INFO_EXT): $(efaq_deps)
$(mkinfodir)
$(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/efaq.texi
efaq.dvi: $(efaq_deps)
$(ENVADD) $(TEXI2DVI) ${srcdir}/efaq.texi
efaq.pdf: $(efaq_deps)
$(ENVADD) $(TEXI2PDF) ${srcdir}/efaq.texi
efaq.html: $(efaq_deps)
$(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/efaq.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
eieio_deps = ${srcdir}/eieio.texi ${gfdl}
eieio : $(buildinfodir)/eieio$(INFO_EXT)
$(buildinfodir)/eieio$(INFO_EXT): $(eieio_deps)
@ -611,31 +636,6 @@ eudc.pdf: $(eudc_deps)
eudc.html: $(eudc_deps)
$(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/eudc.texi
## No gfdl dependency.
faq_deps = ${srcdir}/faq.texi $(emacsdir)/emacsver.texi
efaq : $(buildinfodir)/efaq$(INFO_EXT)
$(buildinfodir)/efaq$(INFO_EXT): $(faq_deps)
$(mkinfodir)
$(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/faq.texi
faq.dvi: $(faq_deps)
$(ENVADD) $(TEXI2DVI) ${srcdir}/faq.texi
faq.pdf: $(faq_deps)
$(ENVADD) $(TEXI2PDF) ${srcdir}/faq.texi
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)

0
doc/misc/faq.texi → doc/misc/efaq.texi
View file