Commit 40abffe4 authored by Glenn Morris's avatar Glenn Morris

Get rid of the INFO_EXT variable

It's never been anything more than pointless complexity

* configure.ac (INFO_EXT, INFO_OPTS): Remove output variables.

* Makefile.in (INFO_EXT): Remove and replace by ".info" throughout.

* doc/emacs/Makefile.in (INFO_EXT): Remove and replace by ".info" throughout.
(INFO_OPTS): Set directly rather than with configure.

* doc/lispintro/Makefile.in (INFO_EXT): Remove and replace by ".info" throughout.
(INFO_OPTS): Set directly rather than with configure.

* doc/lispref/Makefile.in (INFO_EXT): Remove and replace by ".info" throughout.
(INFO_OPTS): Set directly rather than with configure.

* doc/misc/Makefile.in (INFO_EXT): Remove and replace by ".info" throughout.
(INFO_OPTS): Set directly rather than with configure.
parent bb175792
2014-06-10 Glenn Morris <rgm@gnu.org>
* Makefile.in (INFO_EXT): Remove and replace by ".info" throughout.
* configure.ac (INFO_EXT, INFO_OPTS): Remove output variables.
2014-06-08 Paul Eggert <eggert@cs.ucla.edu>
Port better to AIX (Bug#17598).
......
......@@ -146,8 +146,7 @@ man1dir=$(mandir)/man1
# Where to install and expect the info files describing Emacs.
infodir=@infodir@
# Info files not in the doc/misc directory (we get those via make echo-info).
INFO_EXT=@INFO_EXT@
INFO_NONMISC=emacs$(INFO_EXT) eintr$(INFO_EXT) elisp$(INFO_EXT)
INFO_NONMISC=emacs.info eintr.info elisp.info
# If no makeinfo was found and configured --without-makeinfo, "no"; else "yes".
HAVE_MAKEINFO=@HAVE_MAKEINFO@
......
......@@ -1113,12 +1113,6 @@ with the `--without-makeinfo' option to build without the manuals.] )
fi
AC_SUBST(HAVE_MAKEINFO)
dnl Just so that there is only a single place we need to edit.
INFO_EXT=.info
INFO_OPTS=--no-split
AC_SUBST(INFO_EXT)
AC_SUBST(INFO_OPTS)
if test $opsys = mingw32; then
DOCMISC_W32=efaq-w32
else
......
2014-06-10 Glenn Morris <rgm@gnu.org>
* Makefile.in (INFO_EXT): Remove and replace by ".info" throughout.
(INFO_OPTS): Set directly rather than with configure.
2014-06-08 Glenn Morris <rgm@gnu.org>
* entering.texi (Entering Emacs): Small fix re initial-buffer-choice.
......
......@@ -54,12 +54,11 @@ GZIP_PROG = @GZIP_PROG@
HTML_OPTS = --no-split --html
INFO_EXT=@INFO_EXT@
# Options used only when making info output.
# --no-split is only needed because of MS-DOS.
# For a possible alternative, see
# http://lists.gnu.org/archive/html/emacs-devel/2011-01/msg01182.html
INFO_OPTS=@INFO_OPTS@
INFO_OPTS= --no-split
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
......@@ -153,7 +152,7 @@ mkinfodir = @${MKDIR_P} ${buildinfodir}
.dvi.ps:
$(DVIPS) -o $@ $<
info: $(buildinfodir)/emacs$(INFO_EXT)
info: $(buildinfodir)/emacs.info
dvi: $(DVI_TARGETS)
html: $(HTML_TARGETS)
pdf: $(PDF_TARGETS)
......@@ -163,7 +162,7 @@ ps: $(PS_TARGETS)
# There is no provision for Info files to exist in the build directory.
# In a distribution of Emacs, the Info files should be up to date.
# Note: "<" is not portable in ordinary make rules.
$(buildinfodir)/emacs$(INFO_EXT): ${EMACSSOURCES}
$(buildinfodir)/emacs.info: ${EMACSSOURCES}
$(mkinfodir)
$(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/emacs.texi
......@@ -200,9 +199,9 @@ distclean: clean
## In the standalone tarfile, the clean rule runs this.
infoclean:
rm -f \
$(buildinfodir)/emacs$(INFO_EXT) \
$(buildinfodir)/emacs$(INFO_EXT)-[1-9] \
$(buildinfodir)/emacs$(INFO_EXT)-[1-9][0-9]
$(buildinfodir)/emacs.info \
$(buildinfodir)/emacs.info-[1-9] \
$(buildinfodir)/emacs.info-[1-9][0-9]
maintainer-clean: distclean infoclean
......@@ -220,7 +219,6 @@ dist:
-e 's/^\(clean:.*\)/\1 infoclean/' \
-e "s/@ver[s]ion@/${version}/" \
-e 's/@MAKE[I]NFO@/makeinfo/' -e 's/@MK[D]IR_P@/mkdir -p/' \
-e 's/@IN[F]O_EXT@/.info/' -e 's/@IN[F]O_OPTS@//' \
${srcdir}/Makefile.in > emacs-manual-${version}/Makefile
@if grep '@[a-zA-Z_]*@' emacs-manual-${version}/Makefile; then \
echo "Unexpanded configure variables in Makefile?" 1>&2; exit 1; \
......
2014-06-10 Glenn Morris <rgm@gnu.org>
* Makefile.in (INFO_EXT): Remove and replace by ".info" throughout.
(INFO_OPTS): Set directly rather than with configure.
2014-06-02 Glenn Morris <rgm@gnu.org>
* emacs-lisp-intro.texi (Autoload): Update loaddefs.el details.
......
......@@ -46,9 +46,8 @@ GZIP_PROG = @GZIP_PROG@
HTML_OPTS = --no-split --html
INFO_EXT=@INFO_EXT@
# Options used only when making info output.
INFO_OPTS=@INFO_OPTS@
INFO_OPTS= --no-split
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
......@@ -79,7 +78,7 @@ srcs = ${srcdir}/emacs-lisp-intro.texi ${srcdir}/doclicense.texi \
.dvi.ps:
$(DVIPS) -o $@ $<
info: ${buildinfodir}/eintr$(INFO_EXT)
info: ${buildinfodir}/eintr.info
dvi: $(DVI_TARGETS)
html: $(HTML_TARGETS)
......@@ -89,7 +88,7 @@ ps: $(PS_TARGETS)
# The file name eintr must fit within 5 characters, to allow for
# -NN extensions to fit into DOS 8+3 limits without clashing.
# Note: "<" is not portable in ordinary make rules.
${buildinfodir}/eintr$(INFO_EXT): ${srcs}
${buildinfodir}/eintr.info: ${srcs}
$(mkinfodir)
$(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/emacs-lisp-intro.texi
......@@ -117,8 +116,8 @@ distclean: clean
infoclean:
rm -f \
$(buildinfodir)/eintr$(INFO_EXT) \
$(buildinfodir)/eintr$(INFO_EXT)-[1-9]
$(buildinfodir)/eintr.info \
$(buildinfodir)/eintr.info-[1-9]
maintainer-clean: distclean infoclean
......@@ -136,7 +135,6 @@ dist:
-e 's/^\(clean:.*\)/\1 infoclean/' \
-e "s/@ver[s]ion@/${version}/" \
-e 's/@MAKE[I]NFO@/makeinfo/' -e 's/@MK[D]IR_P@/mkdir -p/' \
-e 's/@IN[F]O_EXT@/.info/' -e 's/@IN[F]O_OPTS@//' \
${srcdir}/Makefile.in > emacs-lispintro-${version}/Makefile
@if grep '@[a-zA-Z_]*@' emacs-lispintro-${version}/Makefile; then \
echo "Unexpanded configure variables in Makefile?" 1>&2; exit 1; \
......
2014-06-10 Glenn Morris <rgm@gnu.org>
* Makefile.in (INFO_EXT): Remove and replace by ".info" throughout.
(INFO_OPTS): Set directly rather than with configure.
2014-06-09 Paul Eggert <eggert@cs.ucla.edu>
Say (accept-process-output P)'s result pertains to P if P is non-nil.
......
......@@ -49,9 +49,8 @@ GZIP_PROG = @GZIP_PROG@
HTML_OPTS = --no-split --html
INFO_EXT=@INFO_EXT@
# Options used only when making info output.
INFO_OPTS=@INFO_OPTS@
INFO_OPTS= --no-split
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
......@@ -134,14 +133,14 @@ mkinfodir = @${MKDIR_P} ${buildinfodir}
.dvi.ps:
$(DVIPS) -o $@ $<
info: $(buildinfodir)/elisp$(INFO_EXT)
info: $(buildinfodir)/elisp.info
dvi: $(DVI_TARGETS)
html: $(HTML_TARGETS)
pdf: $(PDF_TARGETS)
ps: $(PS_TARGETS)
## Note: "<" is not portable in ordinary make rules.
$(buildinfodir)/elisp$(INFO_EXT): $(srcs)
$(buildinfodir)/elisp.info: $(srcs)
$(mkinfodir)
$(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ $(srcdir)/elisp.texi
......@@ -172,9 +171,9 @@ distclean: clean
infoclean:
rm -f \
$(buildinfodir)/elisp$(INFO_EXT) \
$(buildinfodir)/elisp$(INFO_EXT)-[1-9] \
$(buildinfodir)/elisp$(INFO_EXT)-[1-9][0-9]
$(buildinfodir)/elisp.info \
$(buildinfodir)/elisp.info-[1-9] \
$(buildinfodir)/elisp.info-[1-9][0-9]
maintainer-clean: distclean infoclean
......@@ -193,7 +192,6 @@ dist:
-e 's/^\(clean:.*\)/\1 infoclean/' \
-e "s/@ver[s]ion@/${version}/" \
-e 's/@MAKE[I]NFO@/makeinfo/' -e 's/@MK[D]IR_P@/mkdir -p/' \
-e 's/@IN[F]O_EXT@/.info/' -e 's/@IN[F]O_OPTS@//' \
${srcdir}/Makefile.in > emacs-lispref-${version}/Makefile
@if grep '@[a-zA-Z_]*@' emacs-lispref-${version}/Makefile; then \
echo "Unexpanded configure variables in Makefile?" 1>&2; exit 1; \
......
2014-06-10 Glenn Morris <rgm@gnu.org>
* Makefile.in (INFO_EXT): Remove and replace by ".info" throughout.
(INFO_OPTS): Set directly rather than with configure.
2014-06-08 Karl Berry <karl@gnu.org>
* doc/info.texi (Help-^L): "mode line", "screenful",
......
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