diff options
| author | Richard M. Stallman | 1995-07-18 06:07:25 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1995-07-18 06:07:25 +0000 |
| commit | d58c5947afc962d5dd1df2dfb114db70340fca1e (patch) | |
| tree | 6ca652d44d11196809de469213a333720e561abe | |
| parent | b2959c9d78e898089cd15be3af58ba437ce33bfa (diff) | |
| download | emacs-d58c5947afc962d5dd1df2dfb114db70340fca1e.tar.gz emacs-d58c5947afc962d5dd1df2dfb114db70340fca1e.zip | |
(src/paths.h, paths-force): Rename src/paths.h.in to src/paths.in.
(Makefile): Depend on src/Makefile.in, not src/Makefile.in.in.
| -rw-r--r-- | Makefile.in | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Makefile.in b/Makefile.in index e1e6c9d0739..7236014e390 100644 --- a/Makefile.in +++ b/Makefile.in | |||
| @@ -201,11 +201,11 @@ all: paths-force ${SUBDIR} | |||
| 201 | removenullpaths=sed -e 's/^://g' -e 's/:$$//g' -e 's/::/:/g' | 201 | removenullpaths=sed -e 's/^://g' -e 's/:$$//g' -e 's/::/:/g' |
| 202 | 202 | ||
| 203 | # Note that sed is not in /bin on 386bsd. | 203 | # Note that sed is not in /bin on 386bsd. |
| 204 | src/paths.h: Makefile ${srcdir}/src/paths.h.in | 204 | src/paths.h: Makefile ${srcdir}/src/paths.in |
| 205 | @echo "Producing \`src/paths.h' from \`src/paths.h.in'." | 205 | @echo "Producing \`src/paths.h' from \`src/paths.in'." |
| 206 | @(lisppath=`echo ${lisppath} | ${removenullpaths}` ; \ | 206 | @(lisppath=`echo ${lisppath} | ${removenullpaths}` ; \ |
| 207 | buildlisppath=`echo ${buildlisppath} | ${removenullpaths}` ; \ | 207 | buildlisppath=`echo ${buildlisppath} | ${removenullpaths}` ; \ |
| 208 | sed < ${srcdir}/src/paths.h.in > paths.h.tmp$$$$ \ | 208 | sed < ${srcdir}/src/paths.in > paths.h.tmp$$$$ \ |
| 209 | -e 's;\(#.*PATH_LOADSEARCH\).*$$;\1 "'$${lisppath}'";' \ | 209 | -e 's;\(#.*PATH_LOADSEARCH\).*$$;\1 "'$${lisppath}'";' \ |
| 210 | -e 's;\(#.*PATH_DUMPLOADSEARCH\).*$$;\1 "'$${buildlisppath}'";' \ | 210 | -e 's;\(#.*PATH_DUMPLOADSEARCH\).*$$;\1 "'$${buildlisppath}'";' \ |
| 211 | -e 's;\(#.*PATH_EXEC\).*$$;\1 "${archlibdir}";' \ | 211 | -e 's;\(#.*PATH_EXEC\).*$$;\1 "${archlibdir}";' \ |
| @@ -227,10 +227,10 @@ src/paths.h: Makefile ${srcdir}/src/paths.h.in | |||
| 227 | # that rule and this one, in a parallel make. | 227 | # that rule and this one, in a parallel make. |
| 228 | # It is possible for paths.h to be updated twice--but that would happen anyway. | 228 | # It is possible for paths.h to be updated twice--but that would happen anyway. |
| 229 | paths-force: FRC src/paths.h | 229 | paths-force: FRC src/paths.h |
| 230 | @echo "Producing \`src/paths.h' from \`src/paths.h.in'." | 230 | @echo "Producing \`src/paths.h' from \`src/paths.in'." |
| 231 | @(lisppath=`echo ${lisppath} | ${removenullpaths}` ; \ | 231 | @(lisppath=`echo ${lisppath} | ${removenullpaths}` ; \ |
| 232 | buildlisppath=`echo ${buildlisppath} | ${removenullpaths}` ; \ | 232 | buildlisppath=`echo ${buildlisppath} | ${removenullpaths}` ; \ |
| 233 | sed < ${srcdir}/src/paths.h.in > paths.h.tmp$$$$ \ | 233 | sed < ${srcdir}/src/paths.in > paths.h.tmp$$$$ \ |
| 234 | -e 's;\(#.*PATH_LOADSEARCH\).*$$;\1 "'$${lisppath}'";' \ | 234 | -e 's;\(#.*PATH_LOADSEARCH\).*$$;\1 "'$${lisppath}'";' \ |
| 235 | -e 's;\(#.*PATH_DUMPLOADSEARCH\).*$$;\1 "'$${buildlisppath}'";' \ | 235 | -e 's;\(#.*PATH_DUMPLOADSEARCH\).*$$;\1 "'$${buildlisppath}'";' \ |
| 236 | -e 's;\(#.*PATH_EXEC\).*$$;\1 "${archlibdir}";' \ | 236 | -e 's;\(#.*PATH_EXEC\).*$$;\1 "${archlibdir}";' \ |
| @@ -263,7 +263,7 @@ blessmail: ${SUBDIR_MAKEFILES} src FRC | |||
| 263 | Makefile: Makefile.in config.status | 263 | Makefile: Makefile.in config.status |
| 264 | ./config.status | 264 | ./config.status |
| 265 | 265 | ||
| 266 | src/Makefile: src/Makefile.in.in config.status | 266 | src/Makefile: src/Makefile.in config.status |
| 267 | ./config.status | 267 | ./config.status |
| 268 | 268 | ||
| 269 | lib-src/Makefile: lib-src/Makefile.in config.status | 269 | lib-src/Makefile: lib-src/Makefile.in config.status |