Commit 2fecccba authored by Glenn Morris's avatar Glenn Morris

Rename infodir to buildinfodir in doc/*/Makefile.in (bug#11737)

This also makes it clearer that it has no relation to the "infodir"
used by install.
parent 05c44a75
2012-06-19 Glenn Morris <rgm@gnu.org>
* Makefile.in: Rename infodir to buildinfodir throughout. (Bug#11737)
2012-06-11 Chong Yidong <cyd@gnu.org>
* emacs.texi: Remove urlcolor setting.
......
......@@ -31,7 +31,7 @@ version=@version@
## This is a bit funny. Because the info files are in the
## distribution tarfiles, they are always made in $scrdir/../../info,
## even for out-of-tree builds.
infodir = $(srcdir)/../../info
buildinfodir = $(srcdir)/../../info
# Directory with the (customized) texinfo.tex file.
texinfodir = $(srcdir)/../misc
......@@ -114,11 +114,11 @@ EMACSSOURCES= \
## repository and the release tarfiles. We do not use any
## equivalent of mkdir -p/install-sh -d, so this is not a general
## solution anyway. The second test -d is for parallel builds.
mkinfodir = @test -d ${infodir} || mkdir ${infodir} || test -d ${infodir}
mkinfodir = @test -d ${buildinfodir} || mkdir ${buildinfodir} || test -d ${buildinfodir}
.PHONY: info dvi html pdf ps
info: $(infodir)/emacs
info: $(buildinfodir)/emacs
dvi: emacs.dvi
html: emacs.html
pdf: emacs.pdf
......@@ -128,7 +128,7 @@ ps: emacs.ps
# 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.
$(infodir)/emacs: ${EMACSSOURCES}
$(buildinfodir)/emacs: ${EMACSSOURCES}
$(mkinfodir)
$(MAKEINFO) $(MAKEINFO_OPTS) -o $@ ${srcdir}/emacs.texi
......@@ -171,7 +171,7 @@ distclean: clean
## In the standalone tarfile, the clean rule runs this.
infoclean:
-cd $(infodir) && rm -f emacs emacs-[1-9] emacs-[1-9][0-9]
-cd $(buildinfodir) && rm -f emacs emacs-[1-9] emacs-[1-9][0-9]
maintainer-clean: distclean infoclean
......@@ -185,7 +185,8 @@ dist:
cp ${srcdir}/*.texi ${texinfodir}/texinfo.tex \
${srcdir}/ChangeLog* emacs-manual-${version}/
sed -e 's/@sr[c]dir@/./' -e 's/^\(texinfodir *=\).*/\1 ./' \
-e 's/^\(infodir *=\).*/\1 ./' -e 's/^\(clean:.*\)/\1 infoclean/' \
-e 's/^\(buildinfodir *=\).*/\1 ./' \
-e 's/^\(clean:.*\)/\1 infoclean/' \
-e "s/@ver[s]ion@/${version}/" \
${srcdir}/Makefile.in > emacs-manual-${version}/Makefile
tar -cf emacs-manual-${version}.tar emacs-manual-${version}
......
2012-06-19 Glenn Morris <rgm@gnu.org>
* Makefile.in: Rename infodir to buildinfodir throughout. (Bug#11737)
2012-06-01 Chong Yidong <cyd@gnu.org>
* Version 24.1 released.
......
......@@ -22,7 +22,7 @@ SHELL = /bin/sh
srcdir = @srcdir@
version=@version@
infodir = $(srcdir)/../../info
buildinfodir = $(srcdir)/../../info
# Directory with the (customized) texinfo.tex file.
texinfodir = $(srcdir)/../misc
......@@ -35,11 +35,11 @@ DVIPS = dvips
ENVADD = TEXINPUTS="$(srcdir):$(texinfodir):$(TEXINPUTS)" \
MAKEINFO="$(MAKEINFO) $(MAKEINFO_OPTS)"
mkinfodir = @test -d ${infodir} || mkdir ${infodir} || test -d ${infodir}
mkinfodir = @test -d ${buildinfodir} || mkdir ${buildinfodir} || test -d ${buildinfodir}
.PHONY: info dvi html pdf ps
info: ${infodir}/eintr
info: ${buildinfodir}/eintr
dvi: emacs-lisp-intro.dvi
html: emacs-lisp-intro.html
......@@ -49,7 +49,7 @@ ps: emacs-lisp-intro.ps
# 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.
${infodir}/eintr: ${srcdir}/emacs-lisp-intro.texi
${buildinfodir}/eintr: ${srcdir}/emacs-lisp-intro.texi
$(mkinfodir)
$(MAKEINFO) $(MAKEINFO_OPTS) -o $@ ${srcdir}/emacs-lisp-intro.texi
......@@ -79,7 +79,7 @@ clean: mostlyclean
distclean: clean
infoclean:
-cd $(infodir) && rm -f eintr eintr-[1-9]
-cd $(buildinfodir) && rm -f eintr eintr-[1-9]
maintainer-clean: distclean infoclean
......@@ -92,7 +92,8 @@ dist:
${texinfodir}/texinfo.tex \
${srcdir}/ChangeLog* ${srcdir}/README emacs-lispintro-${version}/
sed -e 's/@sr[c]dir@/./' -e 's/^\(texinfodir *=\).*/\1 ./' \
-e 's/^\(infodir *=\).*/\1 ./' -e 's/^\(clean:.*\)/\1 infoclean/' \
-e 's/^\(buildinfodir *=\).*/\1 ./' \
-e 's/^\(clean:.*\)/\1 infoclean/' \
-e "s/@ver[s]ion@/${version}/" \
${srcdir}/Makefile.in > emacs-lispintro-${version}/Makefile
tar -cf emacs-lispintro-${version}.tar emacs-lispintro-${version}
......
2012-06-19 Glenn Morris <rgm@gnu.org>
* Makefile.in: Rename infodir to buildinfodir throughout. (Bug#11737)
2012-06-11 Chong Yidong <cyd@gnu.org>
* elisp.texi, vol1.texi, vol2.texi: Remove urlcolor setting.
......
......@@ -24,7 +24,7 @@ srcdir = @srcdir@
version=@version@
infodir = $(srcdir)/../../info
buildinfodir = $(srcdir)/../../info
# Directory with the (customized) texinfo.tex file.
texinfodir = $(srcdir)/../misc
# Directory with emacsver.texi.
......@@ -96,18 +96,18 @@ srcs = \
$(srcdir)/gpl.texi \
$(srcdir)/doclicense.texi
mkinfodir = @test -d ${infodir} || mkdir ${infodir} || test -d ${infodir}
mkinfodir = @test -d ${buildinfodir} || mkdir ${buildinfodir} || test -d ${buildinfodir}
.PHONY: info dvi pdf ps
info: $(infodir)/elisp
info: $(buildinfodir)/elisp
dvi: elisp.dvi
html: elisp.html
pdf: elisp.pdf
ps: elisp.ps
## Note: "<" is not portable in ordinary make rules.
$(infodir)/elisp: $(srcs)
$(buildinfodir)/elisp: $(srcs)
$(mkinfodir)
$(MAKEINFO) $(MAKEINFO_OPTS) -o $@ $(srcdir)/elisp.texi
......@@ -140,7 +140,7 @@ clean: mostlyclean
distclean: clean
infoclean:
-cd $(infodir) && rm -f elisp elisp-[1-9] elisp-[1-9][0-9]
-cd $(buildinfodir) && rm -f elisp elisp-[1-9] elisp-[1-9][0-9]
maintainer-clean: distclean infoclean
......@@ -155,7 +155,8 @@ dist:
${srcdir}/README emacs-lispref-${version}/
sed -e 's/@sr[c]dir@/./' -e 's/^\(texinfodir *=\).*/\1 ./' \
-e 's/^\(emacsdir *=\).*/\1 ./' \
-e 's/^\(infodir *=\).*/\1 ./' -e 's/^\(clean:.*\)/\1 infoclean/' \
-e 's/^\(buildinfodir *=\).*/\1 ./' \
-e 's/^\(clean:.*\)/\1 infoclean/' \
-e "s/@ver[s]ion@/${version}/" \
${srcdir}/Makefile.in > emacs-lispref-${version}/Makefile
tar -cf emacs-lispref-${version}.tar emacs-lispref-${version}
......
2012-06-19 Glenn Morris <rgm@gnu.org>
* Makefile.in: Rename infodir to buildinfodir throughout. (Bug#11737)
2012-06-01 Chong Yidong <cyd@gnu.org>
* Version 24.1 released.
......
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