Set SHELL and VPATH when running makeinfo in lispintro.

Don't copy lispref/index.texi to the staging directory.

1 files changed, 3 insertions, 2 deletions

diff --git a/make-dist b/make-dist
index 1923f5dd55c..7441aa2b6ed 100755
--- a/make-dist
+++ b/make-dist
@@ -242,7 +242,7 @@ then
   echo "Updating Info files"
   (cd man; make -f Makefile.in srcdir=. info)
   (cd lispref; make -f Makefile.in srcdir=. info)
-  (cd lispintro; make -f Makefile.in srcdir=. info)
+  (cd lispintro; make -f Makefile.in SHELL=/bin/sh srcdir=. info VPATH=.)
 
   echo "Updating finder, custom and autoload data"
   (cd lisp; make updates EMACS="$EMACS")
@@ -595,7 +595,8 @@ echo "Making links to \`man'"
 
 echo "Making links to \`lispref'"
 (cd lispref
- ln *.texi *.aux *.cps *.fns *.kys *.vrs index.*perm ../${tempdir}/lispref
+ ln `ls -1 *.texi | grep -v index.texi` ../${tempdir}/lispref
+ ln *.aux *.cps *.fns *.kys *.vrs index.*perm ../${tempdir}/lispref
  ln *.txt *.el spellfile permute-index tindex.pl ../${tempdir}/lispref
  test -f README && ln README ../${tempdir}/lispref
  test -f Makefile.in && ln Makefile.in ../${tempdir}/lispref