[Emacs-diffs] /srv/bzr/emacs/trunk r101888: Replace use of VPATH in most doc/ Makefiles.

[Glenn Morris]

------------------------------------------------------------
revno: 101888
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sat 2010-10-09 14:19:09 -0700
message:
  Replace use of VPATH in most doc/ Makefiles.
  
  * doc/lispref/Makefile.in (VPATH): Remove.
  (infodir): Make it absolute.
  (mkinfodir, $(infodir)/elisp, infoclean): No need to cd $srcdir.
  
  * doc/lispintro/Makefile.in (VPATH): Remove.
  (infodir): Make it absolute.
  (mkinfodir, $(infodir)/eintr, infoclean): No need to cd $srcdir.
  
  * doc/emacs/Makefile.in (VPATH): Remove.
  (infodir): Make it absolute.
  (mkinfodir, $(infodir)/emacs, infoclean): No need to cd $srcdir.
  
  * doc/misc/Makefile.in: Comment.
modified:
  doc/emacs/ChangeLog
  doc/emacs/Makefile.in
  doc/lispintro/ChangeLog
  doc/lispintro/Makefile.in
  doc/lispref/ChangeLog
  doc/lispref/Makefile.in
  doc/misc/Makefile.in

=== modified file 'doc/emacs/ChangeLog'
--- a/doc/emacs/ChangeLog       2010-10-09 20:36:14 +0000
+++ b/doc/emacs/ChangeLog       2010-10-09 21:19:09 +0000
@@ -1,5 +1,9 @@
 2010-10-09  Glenn Morris  <address@hidden>
 
+       * Makefile.in (VPATH): Remove.
+       (infodir): Make it absolute.
+       (mkinfodir, $(infodir)/emacs, infoclean): No need to cd $srcdir.
+
        * Makefile.in (dist): Anchor regexps.
 
        * Makefile.in (EMACSSOURCES): Put emacs.texi first.

=== modified file 'doc/emacs/Makefile.in'
--- a/doc/emacs/Makefile.in     2010-10-09 20:36:14 +0000
+++ b/doc/emacs/Makefile.in     2010-10-09 21:19:09 +0000
@@ -25,9 +25,6 @@
 # of the source tree.  This is set by configure's `--srcdir' option.
 address@hidden@
 
-# Tell make where to find source files; this is needed for the makefiles.
address@hidden@
-
 # Only for make dist.
 address@hidden@
 
@@ -35,10 +32,8 @@
 ## Note that the setfilename command in the .texi files assumes this.
 ## 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.  So infodir is really relative to srcdir.
-## The use of VPATH makes it work out, but why not set
-## infodir = $(srcdir)/../../info and make it explicit?
-infodir=../../info
+## even for out-of-tree builds.
+infodir = $(srcdir)/../../info
 # Directory with the (customized) texinfo.tex file.
 texinfodir = $(srcdir)/../misc
 
@@ -121,7 +116,7 @@
 ## repository and the release tarfiles.  We do not use any
 ## equivalent of mkdir -p/mkinstalldirs, so this is not a general
 ## solution anyway.  The second test -d is for parallel builds.
-mkinfodir = @cd ${srcdir}; test -d ${infodir} || mkdir ${infodir} || test -d 
${infodir}
+mkinfodir = @test -d ${infodir} || mkdir ${infodir} || test -d ${infodir}
 
 .PHONY: info dvi pdf
 
@@ -135,7 +130,7 @@
 
 $(infodir)/emacs: ${EMACSSOURCES}
        $(mkinfodir)
-       cd $(srcdir); $(MAKEINFO) $< -o $@
+       $(MAKEINFO) $< -o $@
 
 emacs.dvi: ${EMACSSOURCES}
        $(ENVADD) $(TEXI2DVI) $<
@@ -166,7 +161,7 @@
 
 ## In the standalone tarfile, the clean rule runs this.
 infoclean:
-       -cd $(srcdir) && cd $(infodir) && rm -f emacs emacs-[1-9] 
emacs-[1-9][0-9]
+       -cd $(infodir) && rm -f emacs emacs-[1-9] emacs-[1-9][0-9]
 
 maintainer-clean: distclean infoclean
 

=== modified file 'doc/lispintro/ChangeLog'
--- a/doc/lispintro/ChangeLog   2010-10-09 20:36:14 +0000
+++ b/doc/lispintro/ChangeLog   2010-10-09 21:19:09 +0000
@@ -1,5 +1,9 @@
 2010-10-09  Glenn Morris  <address@hidden>
 
+       * Makefile.in (VPATH): Remove.
+       (infodir): Make it absolute.
+       (mkinfodir, $(infodir)/eintr, infoclean): No need to cd $srcdir.
+
        * Makefile.in (dist): Anchor regexps.
 
        * Makefile.in (${infodir}/eintr, emacs-lisp-intro.dvi)

=== modified file 'doc/lispintro/Makefile.in'
--- a/doc/lispintro/Makefile.in 2010-10-09 20:36:14 +0000
+++ b/doc/lispintro/Makefile.in 2010-10-09 21:19:09 +0000
@@ -22,10 +22,9 @@
 SHELL = /bin/sh
 
 srcdir = @srcdir@
-VPATH = @srcdir@
 address@hidden@
 
-infodir = ../../info
+infodir = $(srcdir)/../../info
 # Directory with the (customized) texinfo.tex file.
 texinfodir = $(srcdir)/../misc
 
@@ -34,7 +33,7 @@
 TEXI2PDF = texi2pdf
 DVIPS = dvips
 
-mkinfodir = @cd ${srcdir}; test -d ${infodir} || mkdir ${infodir} || test -d 
${infodir}
+mkinfodir = @test -d ${infodir} || mkdir ${infodir} || test -d ${infodir}
 
 .SUFFIXES: .dvi .ps .texi
 
@@ -50,7 +49,7 @@
 # -NN extensions to fit into DOS 8+3 limits without clashing.
 ${infodir}/eintr: ${srcdir}/emacs-lisp-intro.texi
        $(mkinfodir)
-       cd $(srcdir); $(MAKEINFO) $< -o $@
+       $(MAKEINFO) $< -o $@
 
 emacs-lisp-intro.dvi: ${srcdir}/emacs-lisp-intro.texi
        $(TEXI2DVI) -I $(srcdir) -I $(texinfodir) $<
@@ -78,7 +77,7 @@
 distclean: clean
 
 infoclean:
-       -cd $(srcdir) && cd $(infodir) && rm -f eintr eintr-[1-9]
+       -cd $(infodir) && rm -f eintr eintr-[1-9]
 
 maintainer-clean: distclean infoclean
 

=== modified file 'doc/lispref/ChangeLog'
--- a/doc/lispref/ChangeLog     2010-10-09 20:36:14 +0000
+++ b/doc/lispref/ChangeLog     2010-10-09 21:19:09 +0000
@@ -1,5 +1,9 @@
 2010-10-09  Glenn Morris  <address@hidden>
 
+       * Makefile.in (VPATH): Remove.
+       (infodir): Make it absolute.
+       (mkinfodir, $(infodir)/elisp, infoclean): No need to cd $srcdir.
+
        * Makefile.in (dist): Anchor regexps.
 
        * Makefile.in (srcs): Put elisp.texi first.

=== modified file 'doc/lispref/Makefile.in'
--- a/doc/lispref/Makefile.in   2010-10-09 20:36:14 +0000
+++ b/doc/lispref/Makefile.in   2010-10-09 21:19:09 +0000
@@ -24,12 +24,9 @@
 # Standard configure variables.
 srcdir = @srcdir@
 
-# Tell make where to find source files; this is needed for the makefiles.
address@hidden@
-
 address@hidden@
 
-infodir = ../../info
+infodir = $(srcdir)/../../info
 # Directory with the (customized) texinfo.tex file.
 texinfodir = $(srcdir)/../misc
 # Directory with emacsver.texi.
@@ -96,7 +93,7 @@
   $(srcdir)/gpl.texi \
   $(srcdir)/doclicense.texi
 
-mkinfodir = @cd ${srcdir}; test -d ${infodir} || mkdir ${infodir} || test -d 
${infodir}
+mkinfodir = @test -d ${infodir} || mkdir ${infodir} || test -d ${infodir}
 
 .PHONY: info dvi pdf
 
@@ -107,7 +104,7 @@
 
 $(infodir)/elisp: $(srcs)
        $(mkinfodir)
-       cd $(srcdir); $(MAKEINFO) -I. -I$(texinfodir) $< -o $@
+       $(MAKEINFO) -I. -I$(texinfodir) $< -o $@
 
 elisp.dvi: $(srcs)
        $(TEXI2DVI) -I $(srcdir) -I $(texinfodir) $<
@@ -130,7 +127,7 @@
 distclean: clean
 
 infoclean:
-       -cd $(srcdir) && cd $(infodir) && rm -f elisp elisp-[1-9] 
elisp-[1-9][0-9]
+       -cd $(infodir) && rm -f elisp elisp-[1-9] elisp-[1-9][0-9]
 
 maintainer-clean: distclean infoclean
 

=== modified file 'doc/misc/Makefile.in'
--- a/doc/misc/Makefile.in      2010-10-09 20:14:43 +0000
+++ b/doc/misc/Makefile.in      2010-10-09 21:19:09 +0000
@@ -27,6 +27,10 @@
 address@hidden@
 
 # Tell make where to find source files; this is needed for the makefiles.
+# Note the other doc Makefiles do not use VPATH anymore, instead
+# they set infodir to an absolute path.  Not doing that here in
+# case INFO_TARGETS gets too long for some feeble shells.
+# (cf src/Makefile.in's shortlisp)
 address@hidden@
 
 ## Where the output files go.