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/lispref/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/lispref/Makefile.in')
| -rw-r--r-- | doc/lispref/Makefile.in | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/doc/lispref/Makefile.in b/doc/lispref/Makefile.in index dd820d85133..32a241e2a2d 100644 --- a/doc/lispref/Makefile.in +++ b/doc/lispref/Makefile.in @@ -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. @@ -101,18 +101,18 @@ srcs = \ $(srcdir)/gpl.texi \ $(srcdir)/doclicense.texi -mkinfodir = @${MKDIR_P} ${infodir} +mkinfodir = @${MKDIR_P} ${buildinfodir} .PHONY: info dvi pdf ps -info: $(infodir)/elisp$(INFO_EXT) +info: $(buildinfodir)/elisp$(INFO_EXT) dvi: elisp.dvi html: elisp.html pdf: elisp.pdf ps: elisp.ps ## Note: "<" is not portable in ordinary make rules. -$(infodir)/elisp$(INFO_EXT): $(srcs) +$(buildinfodir)/elisp$(INFO_EXT): $(srcs) $(mkinfodir) $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ $(srcdir)/elisp.texi @@ -145,7 +145,7 @@ clean: mostlyclean distclean: clean infoclean: - -cd $(infodir) && rm -f elisp$(INFO_EXT) elisp$(INFO_EXT)-[1-9] elisp$(INFO_EXT)-[1-9][0-9] + -cd $(buildinfodir) && rm -f elisp$(INFO_EXT) elisp$(INFO_EXT)-[1-9] elisp$(INFO_EXT)-[1-9][0-9] maintainer-clean: distclean infoclean @@ -160,7 +160,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} |