(insert-directory): Fix previous change.

[bpt/emacs.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 75d6546..dc5d06c 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -294,10 +294,14 @@ lwlib/Makefile: lwlib/Makefile.in config.status
 ## source exists and is distinct from the destination.
 ## We don't depend on `all', but rather on ${SUBDIR}, so that we won't
 ## ever modify src/paths.h.
-install: ${SUBDIR} install-arch-dep install-arch-indep blessmail
+### We do install-arch-indep first because
+### the executable needs the Lisp files and DOC file to work properly.
+install: ${SUBDIR} install-arch-indep install-arch-dep blessmail
        @true
 
 ### Install the executables that were compiled specifically for this machine.
+### It would be nice to do something for a parallel make
+### to ensure that install-arch-indep finishes before this starts.
 install-arch-dep: mkdir
        (cd lib-src; \
          $(MAKE) install $(MFLAGS) prefix=${prefix} \
@@ -350,9 +354,16 @@ 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 [ -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} ..." ; \
+          (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 +375,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); \
@@ -378,6 +389,10 @@ install-arch-indep: mkdir
           chmod a+r ${man1dir}/$${page}${manext}); \
        done
 
+### Build Emacs and install it, stripping binaries while installing them.
+install-strip:
+       $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install
+
 ### Build all the directories we're going to install Emacs in. Since
 ### we may be creating several layers of directories (for example,
 ### /usr/local/lib/emacs/19.0/mips-dec-ultrix4.2), we use mkinstalldirs
@@ -458,7 +473,7 @@ clean: FRC
 top_distclean=\
        rm -f config.status config.cache config.log ; \
        rm -f Makefile ${SUBDIR_MAKEFILES} ; \
-       (cd lock && rm -f *)
+       (cd lock && (rm * || true))
 distclean: FRC
        (cd src;      $(MAKE) $(MFLAGS) distclean)
        (cd oldXMenu; $(MAKE) $(MFLAGS) distclean)