diff options
| author | Glenn Morris <rgm@gnu.org> | 2012-06-21 00:34:27 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2012-06-21 00:34:27 -0700 |
| commit | ac1a0ce1c6ba60a3faddc64463cb7a697b9d8fd2 (patch) | |
| tree | bffd974c786ea3938e07b4d21ba6761d154aff9e /doc/emacs/Makefile.in | |
| parent | 6b67c0d4c9f275dcf2cc10efd356c98e8f61ae55 (diff) | |
| parent | 2fecccba2f4ee3b6c8aabb3f5a3828912ce2fce1 (diff) | |
| download | emacs-ac1a0ce1c6ba60a3faddc64463cb7a697b9d8fd2.tar.gz | |
Merge from emacs-24; up to 2012-04-26T03:04:36Z!cyd@gnu.org
Diffstat (limited to 'doc/emacs/Makefile.in')
| -rw-r--r-- | doc/emacs/Makefile.in | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/doc/emacs/Makefile.in b/doc/emacs/Makefile.in index 7ffbf52e94f..8f2078192b2 100644 --- a/doc/emacs/Makefile.in +++ b/doc/emacs/Makefile.in @@ -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 @@ -121,11 +121,11 @@ EMACSSOURCES= \ ## This seems pointless. The info/ directory exists in both the ## repository and the release tarfiles. -mkinfodir = @${MKDIR_P} ${infodir} +mkinfodir = @${MKDIR_P} ${buildinfodir} .PHONY: info dvi html pdf ps -info: $(infodir)/emacs$(INFO_EXT) +info: $(buildinfodir)/emacs$(INFO_EXT) dvi: emacs.dvi html: emacs.html pdf: emacs.pdf @@ -135,7 +135,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$(INFO_EXT): ${EMACSSOURCES} +$(buildinfodir)/emacs$(INFO_EXT): ${EMACSSOURCES} $(mkinfodir) $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/emacs.texi @@ -178,7 +178,7 @@ distclean: clean ## In the standalone tarfile, the clean rule runs this. infoclean: - -cd $(infodir) && rm -f emacs$(INFO_EXT) emacs$(INFO_EXT)-[1-9] emacs$(INFO_EXT)-[1-9][0-9] + -cd $(buildinfodir) && rm -f emacs$(INFO_EXT) emacs$(INFO_EXT)-[1-9] emacs$(INFO_EXT)-[1-9][0-9] maintainer-clean: distclean infoclean @@ -192,7 +192,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} |