aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2013-06-22 18:48:23 -0700
committerGlenn Morris2013-06-22 18:48:23 -0700
commit2e667b8ccd507148aa40ad37546b042398234ab8 (patch)
tree7b7df23f141145ce549f267b0dacf729e1c9307b
parent5b165ade1eff0fd62ac22f9b3ccf84933d15c61a (diff)
downloademacs-2e667b8ccd507148aa40ad37546b042398234ab8.tar.gz
emacs-2e667b8ccd507148aa40ad37546b042398234ab8.zip
Remove some doc/misc/Makefile.in stuff that is not needed any more
* doc/misc/Makefile.in (HTML_TARGETS, html, emacs-faq.html, emacs-faq): Remove; not needed now we use a standard html layout for the faq. (clean): Remove HTML_TARGETS, emacs-faq.text.
-rw-r--r--doc/misc/ChangeLog6
-rw-r--r--doc/misc/Makefile.in15
2 files changed, 7 insertions, 14 deletions
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index e167c73f7f1..3a263b68be7 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,9 @@
12013-06-23 Glenn Morris <rgm@gnu.org>
2
3 * Makefile.in (HTML_TARGETS, html, emacs-faq.html, emacs-faq):
4 Remove; not needed now we use a standard html layout for the faq.
5 (clean): Remove HTML_TARGETS, emacs-faq.text.
6
12013-06-21 Eduard Wiebe <usenet@pusto.de> 72013-06-21 Eduard Wiebe <usenet@pusto.de>
2 8
3 * flymake.texi (Parsing the output, Customizable variables): 9 * flymake.texi (Parsing the output, Customizable variables):
diff --git a/doc/misc/Makefile.in b/doc/misc/Makefile.in
index c994a748ce9..4fb4865b8a4 100644
--- a/doc/misc/Makefile.in
+++ b/doc/misc/Makefile.in
@@ -163,8 +163,6 @@ PDF_TARGETS = \
163 wisent.pdf \ 163 wisent.pdf \
164 woman.pdf 164 woman.pdf
165 165
166HTML_TARGETS = emacs-faq.html
167
168TEXI2DVI = texi2dvi 166TEXI2DVI = texi2dvi
169TEXI2PDF = texi2pdf 167TEXI2PDF = texi2pdf
170 168
@@ -194,8 +192,6 @@ webhack: clean
194 192
195dvi: $(DVI_TARGETS) 193dvi: $(DVI_TARGETS)
196 194
197html: $(HTML_TARGETS)
198
199pdf: $(PDF_TARGETS) 195pdf: $(PDF_TARGETS)
200 196
201# Note that all the Info targets build the Info files in srcdir. 197# Note that all the Info targets build the Info files in srcdir.
@@ -402,15 +398,6 @@ faq.dvi: ${srcdir}/faq.texi $(emacsdir)/emacsver.texi
402 $(ENVADD) $(TEXI2DVI) ${srcdir}/faq.texi 398 $(ENVADD) $(TEXI2DVI) ${srcdir}/faq.texi
403faq.pdf: ${srcdir}/faq.texi $(emacsdir)/emacsver.texi 399faq.pdf: ${srcdir}/faq.texi $(emacsdir)/emacsver.texi
404 $(ENVADD) $(TEXI2PDF) ${srcdir}/faq.texi 400 $(ENVADD) $(TEXI2PDF) ${srcdir}/faq.texi
405## This is the name used on the Emacs web-page.
406## sed fixes up links to point to split version of the manual.
407emacs-faq.html: ${srcdir}/faq.texi $(emacsdir)/emacsver.texi
408 $(MAKEINFO) $(MAKEINFO_OPTS) --no-split \
409 --css-ref='/layout.css' --html -o $@ ${srcdir}/faq.texi
410 sed -i -e 's|a href="\([a-z]*\)\.html#\([^"]*\)"|a href="manual/html_node/\1/\2.html"|g' \
411 -e 's|/Top\.html|/|g' $@
412emacs-faq.text: ${srcdir}/faq.texi $(emacsdir)/emacsver.texi
413 $(MAKEINFO) $(MAKEINFO_OPTS) --plaintext -o $@ ${srcdir}/faq.texi
414 401
415flymake : $(buildinfodir)/flymake$(INFO_EXT) 402flymake : $(buildinfodir)/flymake$(INFO_EXT)
416$(buildinfodir)/flymake$(INFO_EXT): ${srcdir}/flymake.texi ${gfdl} 403$(buildinfodir)/flymake$(INFO_EXT): ${srcdir}/flymake.texi ${gfdl}
@@ -720,7 +707,7 @@ mostlyclean:
720 rm -f gnustmp.* 707 rm -f gnustmp.*
721 708
722clean: mostlyclean 709clean: mostlyclean
723 rm -f $(DVI_TARGETS) $(PDF_TARGETS) $(HTML_TARGETS) emacs-faq.text 710 rm -f $(DVI_TARGETS) $(PDF_TARGETS)
724 rm -f emacs-misc-${version}.tar* 711 rm -f emacs-misc-${version}.tar*
725 712
726distclean: clean 713distclean: clean