From: Richard M. Stallman <rms@gnu.org>
Date: Mon, 3 Jun 1996 20:06:27 +0000 (+0000)
Subject: (install-arch-indep): If cd etc makes output,
X-Git-Tag: emacs-19.34~539
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7d2cdc3cc750ec6d09d9953e34acedb31569d82e;p=emacs.git

(install-arch-indep): If cd etc makes output,
don't treat that as part of the tar data.
Check that ./lisp actually exists.
---

diff --git a/Makefile.in b/Makefile.in
index 733133c5a2a..dc5d06cac87 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -354,10 +354,11 @@ install-arch-indep: mkdir
 	if [ `(cd ./etc; /bin/pwd)` != `(cd ${docdir}; /bin/pwd)` ]; \
 	then \
 	   echo "Copying etc/DOC-* to ${docdir} ..." ; \
-	   (cd etc; tar -cf - DOC*)|(cd ${docdir}; umask 0; tar -xvf - ); \
+	   (cd ./etc; tar -cf - DOC*)|(cd ${docdir}; umask 0; tar -xvf - ); \
 	   (cd $(docdir); chmod a+r DOC*; rm DOC) \
 	else true; fi
-	if [ x`(cd ./lisp; /bin/pwd)` != x`(cd ${lispdir}; /bin/pwd)` ] \
+	if [ -r ./lisp ] \
+	   && [ x`(cd ./lisp; /bin/pwd)` != x`(cd ${lispdir}; /bin/pwd)` ] \
 	   && [ x`(cd ${srcdir}/lisp; /bin/pwd)` != x`(cd ./lisp; /bin/pwd)` ]; \
 	then \
 	   echo "Copying lisp/*.el and lisp/*.elc to ${lispdir} ..." ; \