X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/9ca335ed3c36f4449789893ef2da1e648562436b..0f374b2b6c496ae9044e94a722f4c9349436f3c0:/Makefile.in

diff --git a/Makefile.in b/Makefile.in
index ea322f3c50..dc5d06cac8 100644
--- 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,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} ..." ; \
@@ -384,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
@@ -464,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)