(install-arch-indep): Install info/ccmode*.

(install-arch-indep): Copy build-dir's lisp subdir to lispdir.
Protect against /bin/pwd returning null string.

1 files changed, 7 insertions, 1 deletions

diff --git a/Makefile.in b/Makefile.in
index 75d6546949f..ea322f3c507 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -353,6 +353,12 @@ install-arch-indep: mkdir
            (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)` ] \
+           && [ x`(cd ${srcdir}/lisp; /bin/pwd)` != x`(cd ./lisp; /bin/pwd)` ]; \
+        then \
+           echo "Copying lisp/*.el and lisp/*.elc to ${lispdir} ..." ; \
+           (cd lisp; tar -cf - *.el *.elc)|(cd ${lispdir}; umask 0; tar -xvf - ); \
+        else true; fi
         thisdir=`/bin/pwd`; \
         if [ `(cd ${srcdir}/info && /bin/pwd)` != `(cd ${infodir} && /bin/pwd)` ]; \
         then \
@@ -364,7 +370,7 @@ install-arch-indep: mkdir
            cd ${srcdir}/info ; \
            (cd $${thisdir}; ${INSTALL_DATA} ${srcdir}/info/dir ${infodir}/dir); \
            (cd $${thisdir}; chmod a+r ${infodir}/dir); \
-           for f in cl* dired-x* ediff* emacs* forms* gnus* info* mh-e* sc* vip*; do \
+           for f in ccmode* cl* dired-x* ediff* emacs* forms* gnus* info* mh-e* sc* vip*; do \
              (cd $${thisdir}; \
               ${INSTALL_DATA} ${srcdir}/info/$$f ${infodir}/$$f; \
               chmod a+r ${infodir}/$$f); \