(src/paths.h): Target deleted.

(paths-force): Delete all dependencies on this target
but don't delete the target.
(install): Depend on `all'.

1 files changed, 6 insertions, 37 deletions

diff --git a/Makefile.in b/Makefile.in
index 8524e5973c1..920149e2f43 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -197,12 +197,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
+# Generate paths.h from paths.in.  This target is invoked by `configure'.
+paths-force: FRC
         @echo "Producing \`src/paths.h' from \`src/paths.in'."
         @(lisppath=`echo ${lisppath} | ${removenullpaths}` ;            \
           buildlisppath=`echo ${buildlisppath} | ${removenullpaths}` ;  \
@@ -217,38 +217,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 +263,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.