X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/7d2cdc3cc750ec6d09d9953e34acedb31569d82e..eddd51c2807805e47aa70008234111b601e9a050:/Makefile.in

diff --git a/Makefile.in b/Makefile.in
index dc5d06cac8..10f5ce7826 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -175,6 +175,8 @@ docdir=@docdir@
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
+# By default, we uphold the dignity of our programs.
+INSTALL_STRIP =
 
 # ============================= Targets ==============================
 
@@ -197,13 +199,12 @@ SUBDIR_MAKEFILES = lib-src/Makefile man/Makefile src/Makefile oldXMenu/Makefile
 COPYDIR = ${srcdir}/etc ${srcdir}/lisp
 COPYDESTS = ${etcdir} ${lispdir}
 
-all:	paths-force ${SUBDIR}
+all: ${SUBDIR}
 
 removenullpaths=sed -e 's/^://g' -e 's/:$$//g' -e 's/::/:/g'
 
-# Note that sed is not in /bin on 386bsd.
-src/paths.h: Makefile ${srcdir}/src/paths.in
-	@echo "Producing \`src/paths.h' from \`src/paths.in'."
+# Generate paths.h from paths.in.  This target is invoked by `configure'.
+paths-force: FRC
 	@(lisppath=`echo ${lisppath} | ${removenullpaths}` ;		\
 	  buildlisppath=`echo ${buildlisppath} | ${removenullpaths}` ;	\
 	  sed < ${srcdir}/src/paths.in > paths.h.$$$$		\
@@ -217,38 +218,9 @@ src/paths.h: Makefile ${srcdir}/src/paths.in
 	  -e 's;\(#.*PATH_LOCK\).*$$;\1 "${lockdir}/";') &&		\
 	${srcdir}/move-if-change paths.h.$$$$ src/paths.h
 
-# For `make all',
-# we force the rebuilding of src/paths.h because the user might give
-# make different values for the various directories.  Since we use
-# move-if-change, src/paths.h only actually changes if the user did
-# something notable, so the only unnecessary work we do is in building
-# paths.h.$$, which isn't much.
-# Note that sed is not in /bin on 386bsd.
-# We depend on src/paths.h here to prevent simultaneous execution of
-# that rule and this one, in a parallel make.
-# It is possible for paths.h to be updated twice--but that would happen anyway.
-paths-force: FRC src/paths.h
-	@echo "Producing \`src/paths.h' from \`src/paths.in'."
-	@(lisppath=`echo ${lisppath} | ${removenullpaths}` ;		\
-	  buildlisppath=`echo ${buildlisppath} | ${removenullpaths}` ;	\
-	  sed < ${srcdir}/src/paths.in > paths.h.$$$$		\
-	  -e 's;\(#.*PATH_LOADSEARCH\).*$$;\1 "'$${lisppath}'";'	\
-	  -e 's;\(#.*PATH_DUMPLOADSEARCH\).*$$;\1 "'$${buildlisppath}'";' \
-	  -e 's;\(#.*PATH_EXEC\).*$$;\1 "${archlibdir}";'		\
-	  -e 's;\(#.*PATH_INFO\).*$$;\1 "${infodir}";'			\
-	  -e 's;\(#.*PATH_DATA\).*$$;\1 "${etcdir}";'			\
-	  -e 's;\(#.*PATH_BITMAPS\).*$$;\1 "${bitmapdir}";'		\
-	  -e 's;\(#.*PATH_DOC\).*$$;\1 "${docdir}";'			\
-	  -e 's;\(#.*PATH_LOCK\).*$$;\1 "${lockdir}/";') &&		\
-	${srcdir}/move-if-change paths.h.$$$$ src/paths.h
-
-src:	lib-src FRC src/paths.h
+src:	lib-src FRC
 
-# This ought to depend on src/paths.h, so that in parallel make
-# src/paths.h will be available for the compilations in lib-src.
-# But that causes trouble in `make install' if a different prefix
-# is specified at that time.
-lib-src: FRC src/paths.h
+lib-src: FRC
 
 .RECURSIVE: ${SUBDIR}
 
@@ -292,11 +264,9 @@ lwlib/Makefile: lwlib/Makefile.in config.status
 ## place with their files read-only (perhaps because they are checked
 ## into RCS).  In order to make this safe, we make sure that the
 ## 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.
 ### 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
+install: all install-arch-indep install-arch-dep blessmail
 	@true
 
 ### Install the executables that were compiled specifically for this machine.
@@ -306,8 +276,9 @@ install-arch-dep: mkdir
 	(cd lib-src; \
 	  $(MAKE) install $(MFLAGS) prefix=${prefix} \
 	    exec_prefix=${exec_prefix} bindir=${bindir} \
-	    libexecdir=${libexecdir} archlibdir=${archlibdir})
-	${INSTALL_PROGRAM} src/emacs ${bindir}/emacs-${version}
+	    libexecdir=${libexecdir} archlibdir=${archlibdir} \
+	    INSTALL_STRIP=${INSTALL_STRIP})
+	${INSTALL_PROGRAM} $(INSTALL_STRIP) src/emacs ${bindir}/emacs-${version}
 	-chmod 1755  ${bindir}/emacs-${version}
 	rm -f ${bindir}/$(EMACS)
 	-ln ${bindir}/emacs-${version} ${bindir}/$(EMACS)
@@ -375,7 +346,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 ccmode* 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* message* mh-e* sc* vip*; do \
 	     (cd $${thisdir}; \
 	      ${INSTALL_DATA} ${srcdir}/info/$$f ${infodir}/$$f; \
 	      chmod a+r ${infodir}/$$f); \
@@ -391,7 +362,7 @@ install-arch-indep: mkdir
 
 ### Build Emacs and install it, stripping binaries while installing them.
 install-strip:
-	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install
+	$(MAKE) INSTALL_STRIP=-s
 
 ### Build all the directories we're going to install Emacs in.	Since
 ### we may be creating several layers of directories (for example,
@@ -557,7 +528,6 @@ check:
 	@echo "We don't have any tests for GNU Emacs yet."
 
 dist:
-	$(srcdir)/update-subdirs ${srcdir}/lisp
 	cd ${srcdir}; make-dist
 
 .PHONY: info dvi dist check