aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman1994-09-15 03:47:07 +0000
committerRichard M. Stallman1994-09-15 03:47:07 +0000
commit27f314bdd2770683f2bbbcafa7fd6472dd5c8344 (patch)
tree7341a980eb92824642d8cdf3d3ebf04228a23bcb
parentece23c274d2cdc8893d0b450fef568c9c9aaabc1 (diff)
downloademacs-27f314bdd2770683f2bbbcafa7fd6472dd5c8344.tar.gz
emacs-27f314bdd2770683f2bbbcafa7fd6472dd5c8344.zip
(removenullpaths, paths-force):
Put paths.h.tmp in top-level dir, not in src.
-rw-r--r--Makefile.in10
1 files changed, 5 insertions, 5 deletions
diff --git a/Makefile.in b/Makefile.in
index 884125e49b2..633ed44127e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -202,7 +202,7 @@ src/paths.h: Makefile ${srcdir}/src/paths.h.in
202 @echo "Producing \`src/paths.h' from \`src/paths.h.in'." 202 @echo "Producing \`src/paths.h' from \`src/paths.h.in'."
203 @(lisppath=`echo ${lisppath} | ${removenullpaths}` ; \ 203 @(lisppath=`echo ${lisppath} | ${removenullpaths}` ; \
204 buildlisppath=`echo ${buildlisppath} | ${removenullpaths}` ; \ 204 buildlisppath=`echo ${buildlisppath} | ${removenullpaths}` ; \
205 sed < ${srcdir}/src/paths.h.in > src/paths.h.tmp \ 205 sed < ${srcdir}/src/paths.h.in > paths.h.tmp \
206 -e 's;\(#.*PATH_LOADSEARCH\).*$$;\1 "'$${lisppath}'";' \ 206 -e 's;\(#.*PATH_LOADSEARCH\).*$$;\1 "'$${lisppath}'";' \
207 -e 's;\(#.*PATH_DUMPLOADSEARCH\).*$$;\1 "'$${buildlisppath}'";' \ 207 -e 's;\(#.*PATH_DUMPLOADSEARCH\).*$$;\1 "'$${buildlisppath}'";' \
208 -e 's;\(#.*PATH_EXEC\).*$$;\1 "${archlibdir}";' \ 208 -e 's;\(#.*PATH_EXEC\).*$$;\1 "${archlibdir}";' \
@@ -210,20 +210,20 @@ src/paths.h: Makefile ${srcdir}/src/paths.h.in
210 -e 's;\(#.*PATH_DATA\).*$$;\1 "${etcdir}";' \ 210 -e 's;\(#.*PATH_DATA\).*$$;\1 "${etcdir}";' \
211 -e 's;\(#.*PATH_DOC\).*$$;\1 "${docdir}";' \ 211 -e 's;\(#.*PATH_DOC\).*$$;\1 "${docdir}";' \
212 -e 's;\(#.*PATH_LOCK\).*$$;\1 "${lockdir}/";') 212 -e 's;\(#.*PATH_LOCK\).*$$;\1 "${lockdir}/";')
213 @${srcdir}/move-if-change src/paths.h.tmp src/paths.h 213 @${srcdir}/move-if-change paths.h.tmp src/paths.h
214 214
215# For `make all', 215# For `make all',
216# we force the rebuilding of src/paths.h because the user might give 216# we force the rebuilding of src/paths.h because the user might give
217# make different values for the various directories. Since we use 217# make different values for the various directories. Since we use
218# move-if-change, src/paths.h only actually changes if the user did 218# move-if-change, src/paths.h only actually changes if the user did
219# something notable, so the only unnecessary work we do is in building 219# something notable, so the only unnecessary work we do is in building
220# src/paths.h.tmp, which isn't much. 220# paths.h.tmp, which isn't much.
221# Note that sed is not in /bin on 386bsd. 221# Note that sed is not in /bin on 386bsd.
222paths-force: FRC.src.paths.h 222paths-force: FRC.src.paths.h
223 @echo "Producing \`src/paths.h' from \`src/paths.h.in'." 223 @echo "Producing \`src/paths.h' from \`src/paths.h.in'."
224 @(lisppath=`echo ${lisppath} | ${removenullpaths}` ; \ 224 @(lisppath=`echo ${lisppath} | ${removenullpaths}` ; \
225 buildlisppath=`echo ${buildlisppath} | ${removenullpaths}` ; \ 225 buildlisppath=`echo ${buildlisppath} | ${removenullpaths}` ; \
226 sed < ${srcdir}/src/paths.h.in > src/paths.h.tmp \ 226 sed < ${srcdir}/src/paths.h.in > paths.h.tmp \
227 -e 's;\(#.*PATH_LOADSEARCH\).*$$;\1 "'$${lisppath}'";' \ 227 -e 's;\(#.*PATH_LOADSEARCH\).*$$;\1 "'$${lisppath}'";' \
228 -e 's;\(#.*PATH_DUMPLOADSEARCH\).*$$;\1 "'$${buildlisppath}'";' \ 228 -e 's;\(#.*PATH_DUMPLOADSEARCH\).*$$;\1 "'$${buildlisppath}'";' \
229 -e 's;\(#.*PATH_EXEC\).*$$;\1 "${archlibdir}";' \ 229 -e 's;\(#.*PATH_EXEC\).*$$;\1 "${archlibdir}";' \
@@ -231,7 +231,7 @@ paths-force: FRC.src.paths.h
231 -e 's;\(#.*PATH_DATA\).*$$;\1 "${etcdir}";' \ 231 -e 's;\(#.*PATH_DATA\).*$$;\1 "${etcdir}";' \
232 -e 's;\(#.*PATH_DOC\).*$$;\1 "${docdir}";' \ 232 -e 's;\(#.*PATH_DOC\).*$$;\1 "${docdir}";' \
233 -e 's;\(#.*PATH_LOCK\).*$$;\1 "${lockdir}/";') 233 -e 's;\(#.*PATH_LOCK\).*$$;\1 "${lockdir}/";')
234 @${srcdir}/move-if-change src/paths.h.tmp src/paths.h 234 @${srcdir}/move-if-change paths.h.tmp src/paths.h
235 235
236src: lib-src FRC.src src/paths.h 236src: lib-src FRC.src src/paths.h
237 237