(removenullpaths, paths-force):

Put paths.h.tmp in top-level dir, not in src.

diff --git a/Makefile.in b/Makefile.in
index 884125e49b24ca1518e493127738e044277921e9..633ed44127e9f7f607ee6b6f6957f27acefdb841 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -202,7 +202,7 @@ src/paths.h: Makefile ${srcdir}/src/paths.h.in
        @echo "Producing \`src/paths.h' from \`src/paths.h.in'."
        @(lisppath=`echo ${lisppath} | ${removenullpaths}` ;            \
          buildlisppath=`echo ${buildlisppath} | ${removenullpaths}` ;  \
-         sed < ${srcdir}/src/paths.h.in > src/paths.h.tmp              \
+         sed < ${srcdir}/src/paths.h.in > paths.h.tmp          \
          -e 's;\(#.*PATH_LOADSEARCH\).*$$;\1 "'$${lisppath}'";'        \
          -e 's;\(#.*PATH_DUMPLOADSEARCH\).*$$;\1 "'$${buildlisppath}'";' \
          -e 's;\(#.*PATH_EXEC\).*$$;\1 "${archlibdir}";'               \
@@ -210,20 +210,20 @@ src/paths.h: Makefile ${srcdir}/src/paths.h.in
          -e 's;\(#.*PATH_DATA\).*$$;\1 "${etcdir}";'                   \
          -e 's;\(#.*PATH_DOC\).*$$;\1 "${docdir}";'                    \
          -e 's;\(#.*PATH_LOCK\).*$$;\1 "${lockdir}/";')
-       @${srcdir}/move-if-change src/paths.h.tmp src/paths.h
+       @${srcdir}/move-if-change paths.h.tmp 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
-# src/paths.h.tmp, which isn't much.
+# paths.h.tmp, which isn't much.
 # Note that sed is not in /bin on 386bsd.
 paths-force: FRC.src.paths.h
        @echo "Producing \`src/paths.h' from \`src/paths.h.in'."
        @(lisppath=`echo ${lisppath} | ${removenullpaths}` ;            \
          buildlisppath=`echo ${buildlisppath} | ${removenullpaths}` ;  \
-         sed < ${srcdir}/src/paths.h.in > src/paths.h.tmp              \
+         sed < ${srcdir}/src/paths.h.in > paths.h.tmp          \
          -e 's;\(#.*PATH_LOADSEARCH\).*$$;\1 "'$${lisppath}'";'        \
          -e 's;\(#.*PATH_DUMPLOADSEARCH\).*$$;\1 "'$${buildlisppath}'";' \
          -e 's;\(#.*PATH_EXEC\).*$$;\1 "${archlibdir}";'               \
@@ -231,7 +231,7 @@ paths-force: FRC.src.paths.h
          -e 's;\(#.*PATH_DATA\).*$$;\1 "${etcdir}";'                   \
          -e 's;\(#.*PATH_DOC\).*$$;\1 "${docdir}";'                    \
          -e 's;\(#.*PATH_LOCK\).*$$;\1 "${lockdir}/";')
-       @${srcdir}/move-if-change src/paths.h.tmp src/paths.h
+       @${srcdir}/move-if-change paths.h.tmp src/paths.h
 
 src:   lib-src FRC.src src/paths.h