diff options
| -rw-r--r-- | Makefile.in | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/Makefile.in b/Makefile.in index e0a641736ef..63dddb6f65b 100644 --- a/Makefile.in +++ b/Makefile.in | |||
| @@ -253,15 +253,23 @@ lwlib/Makefile: lwlib/Makefile.in config.status | |||
| 253 | ## source exists and is distinct from the destination. | 253 | ## source exists and is distinct from the destination. |
| 254 | ## We don't depend on `all', but rather on ${SUBDIR}, so that we won't | 254 | ## We don't depend on `all', but rather on ${SUBDIR}, so that we won't |
| 255 | ## ever modify src/paths.h. | 255 | ## ever modify src/paths.h. |
| 256 | install: ${SUBDIR} do-install ; | 256 | install: ${SUBDIR} do-install install-arch-dep install-arch-indep; |
| 257 | 257 | ||
| 258 | ### Note that we copy the DOC-* files from the build etc directory | 258 | ### Note that we copy the DOC-* files from the build etc directory |
| 259 | ### as well as lots of things from ${srcdir}/etc. | 259 | ### as well as lots of things from ${srcdir}/etc. |
| 260 | do-install: mkdir | 260 | install-arch-dep: mkdir |
| 261 | (cd lib-src; \ | 261 | (cd lib-src; \ |
| 262 | $(MAKE) install $(MFLAGS) prefix=${prefix} \ | 262 | $(MAKE) install $(MFLAGS) prefix=${prefix} \ |
| 263 | exec_prefix=${exec_prefix} bindir=${bindir} libdir=${libdir} \ | 263 | exec_prefix=${exec_prefix} bindir=${bindir} libdir=${libdir} \ |
| 264 | archlibdir=${archlibdir}) | 264 | archlibdir=${archlibdir}) |
| 265 | ${INSTALL_PROGRAM} src/emacs ${bindir}/emacs-${version} | ||
| 266 | -chmod 1755 ${bindir}/emacs-${version} | ||
| 267 | rm -f ${bindir}/emacs | ||
| 268 | -ln ${bindir}/emacs-${version} ${bindir}/emacs | ||
| 269 | |||
| 270 | ### Note that we copy the DOC-* files from the build etc directory | ||
| 271 | ### as well as lots of things from ${srcdir}/etc. | ||
| 272 | install-arch-indep: mkdir | ||
| 265 | -set ${COPYDESTS} ; \ | 273 | -set ${COPYDESTS} ; \ |
| 266 | for dir in ${COPYDIR} ; do \ | 274 | for dir in ${COPYDIR} ; do \ |
| 267 | if [ `(cd $$1 && pwd)` != `(cd $${dir} && pwd)` ] ; then \ | 275 | if [ `(cd $$1 && pwd)` != `(cd $${dir} && pwd)` ] ; then \ |
| @@ -301,10 +309,6 @@ do-install: mkdir | |||
| 301 | cd ${srcdir}/etc; for page in emacs etags ctags ; do \ | 309 | cd ${srcdir}/etc; for page in emacs etags ctags ; do \ |
| 302 | ${INSTALL_DATA} $${page}.1 ${mandir}/$${page}${manext} ; \ | 310 | ${INSTALL_DATA} $${page}.1 ${mandir}/$${page}${manext} ; \ |
| 303 | done | 311 | done |
| 304 | ${INSTALL_PROGRAM} src/emacs ${bindir}/emacs-${version} | ||
| 305 | -chmod 1755 ${bindir}/emacs-${version} | ||
| 306 | rm -f ${bindir}/emacs | ||
| 307 | -ln ${bindir}/emacs-${version} ${bindir}/emacs | ||
| 308 | 312 | ||
| 309 | ### Build all the directories we're going to install Emacs in. Since | 313 | ### Build all the directories we're going to install Emacs in. Since |
| 310 | ### we may be creating several layers of directories (for example, | 314 | ### we may be creating several layers of directories (for example, |