diff options
| author | Richard M. Stallman | 1997-08-07 18:37:17 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1997-08-07 18:37:17 +0000 |
| commit | c5bfadd660a81ace8dcd6520bf103a7a023054f6 (patch) | |
| tree | d4b5545165614887899877fd02f2f2148db7290c | |
| parent | 5a1d8da6babb177b419997ea83e3da684e1f0a3c (diff) | |
| download | emacs-c5bfadd660a81ace8dcd6520bf103a7a023054f6.tar.gz emacs-c5bfadd660a81ace8dcd6520bf103a7a023054f6.zip | |
(mkdir): Don't create lockdir.
(lockdir): Variable deleted.
(paths-force): Don't operate on PATH_LOCK.
| -rw-r--r-- | Makefile.in | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/Makefile.in b/Makefile.in index d3e79ee7063..1c4122b4663 100644 --- a/Makefile.in +++ b/Makefile.in | |||
| @@ -81,9 +81,8 @@ bindir=@bindir@ | |||
| 81 | datadir=@datadir@ | 81 | datadir=@datadir@ |
| 82 | 82 | ||
| 83 | # Where to install and expect the files that Emacs modifies as it | 83 | # Where to install and expect the files that Emacs modifies as it |
| 84 | # runs. These files are all architecture-independent. Right now, the | 84 | # runs. These files are all architecture-independent. |
| 85 | # only such data is the locking directory; ${lockdir} is a | 85 | # Right now, this is not used. |
| 86 | # subdirectory of this. | ||
| 87 | sharedstatedir=@sharedstatedir@ | 86 | sharedstatedir=@sharedstatedir@ |
| 88 | 87 | ||
| 89 | # Where to install and expect executable files to be run by Emacs | 88 | # Where to install and expect executable files to be run by Emacs |
| @@ -156,11 +155,6 @@ buildlisppath=${srcdir}/lisp | |||
| 156 | # at once. | 155 | # at once. |
| 157 | etcdir=@etcdir@ | 156 | etcdir=@etcdir@ |
| 158 | 157 | ||
| 159 | # Where to create and expect the locking directory, where | ||
| 160 | # the Emacs locking code keeps track of which files are | ||
| 161 | # currently being edited. | ||
| 162 | lockdir=@lockdir@ | ||
| 163 | |||
| 164 | # Where to put executables to be run by Emacs rather than | 158 | # Where to put executables to be run by Emacs rather than |
| 165 | # the user. This path usually includes the Emacs version | 159 | # the user. This path usually includes the Emacs version |
| 166 | # and configuration name, so that multiple configurations | 160 | # and configuration name, so that multiple configurations |
| @@ -218,7 +212,6 @@ paths-force: FRC | |||
| 218 | -e 's;\(#.*PATH_DATA\).*$$;\1 "${etcdir}";' \ | 212 | -e 's;\(#.*PATH_DATA\).*$$;\1 "${etcdir}";' \ |
| 219 | -e 's;\(#.*PATH_BITMAPS\).*$$;\1 "${bitmapdir}";' \ | 213 | -e 's;\(#.*PATH_BITMAPS\).*$$;\1 "${bitmapdir}";' \ |
| 220 | -e 's;\(#.*PATH_DOC\).*$$;\1 "${docdir}";' \ | 214 | -e 's;\(#.*PATH_DOC\).*$$;\1 "${docdir}";' \ |
| 221 | -e 's;\(#.*PATH_LOCK\).*$$;\1 "${lockdir}/";') && \ | ||
| 222 | ${srcdir}/move-if-change paths.h.$$$$ src/paths.h | 215 | ${srcdir}/move-if-change paths.h.$$$$ src/paths.h |
| 223 | 216 | ||
| 224 | src: lib-src FRC | 217 | src: lib-src FRC |
| @@ -386,10 +379,9 @@ install-strip: | |||
| 386 | ### /usr/local/lib/emacs/19.0/mips-dec-ultrix4.2), we use mkinstalldirs | 379 | ### /usr/local/lib/emacs/19.0/mips-dec-ultrix4.2), we use mkinstalldirs |
| 387 | ### instead of mkdir. Not all systems' mkdir programs have the `-p' flag. | 380 | ### instead of mkdir. Not all systems' mkdir programs have the `-p' flag. |
| 388 | mkdir: FRC | 381 | mkdir: FRC |
| 389 | $(srcdir)/mkinstalldirs ${COPYDESTS} ${lockdir} ${infodir} ${man1dir} \ | 382 | $(srcdir)/mkinstalldirs ${COPYDESTS} ${infodir} ${man1dir} \ |
| 390 | ${bindir} ${datadir} ${docdir} ${libexecdir} \ | 383 | ${bindir} ${datadir} ${docdir} ${libexecdir} \ |
| 391 | `echo ${locallisppath} | sed 's/:/ /g'` | 384 | `echo ${locallisppath} | sed 's/:/ /g'` |
| 392 | -chmod a+rwx ${lockdir} | ||
| 393 | 385 | ||
| 394 | ### Delete all the installed files that the `install' target would | 386 | ### Delete all the installed files that the `install' target would |
| 395 | ### create (but not the noninstalled files such as `make all' would | 387 | ### create (but not the noninstalled files such as `make all' would |