diff options
| author | Glenn Morris | 2012-05-18 23:45:24 -0700 |
|---|---|---|
| committer | Glenn Morris | 2012-05-18 23:45:24 -0700 |
| commit | 42d5aa3efc642f46b0dcac9f66d848fb838c04ff (patch) | |
| tree | c43bfdb23d152606dd59439ad33a5f7f30e492b2 | |
| parent | 9192d37dc57541805091a01ab157c8b7ae38713b (diff) | |
| download | emacs-42d5aa3efc642f46b0dcac9f66d848fb838c04ff.tar.gz emacs-42d5aa3efc642f46b0dcac9f66d848fb838c04ff.zip | |
* Makefile.in (install-arch-indep): Remove unneeded chmod.
Set permissions of lisp/subdirs.el.
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | Makefile.in | 5 |
2 files changed, 6 insertions, 2 deletions
| @@ -1,5 +1,8 @@ | |||
| 1 | 2012-05-19 Glenn Morris <rgm@gnu.org> | 1 | 2012-05-19 Glenn Morris <rgm@gnu.org> |
| 2 | 2 | ||
| 3 | * Makefile.in (install-arch-indep): Remove unneeded chmod. | ||
| 4 | Set permissions of lisp/subdirs.el. | ||
| 5 | |||
| 3 | * Makefile.in (SUBDIR): Add leim. Update users. | 6 | * Makefile.in (SUBDIR): Add leim. Update users. |
| 4 | 7 | ||
| 5 | * Makefile.in (lib, lib-src, lisp): Check cd return value. | 8 | * Makefile.in (lib, lib-src, lisp): Check cd return value. |
diff --git a/Makefile.in b/Makefile.in index 62df10baa99..d93efc67790 100644 --- a/Makefile.in +++ b/Makefile.in | |||
| @@ -532,7 +532,6 @@ install-arch-indep: install-leim install-info install-man ${INSTALL_ARCH_INDEP_E | |||
| 532 | [ "$${dir}" != "${srcdir}/etc" ] || rm -f $${dest}/DOC* ; \ | 532 | [ "$${dir}" != "${srcdir}/etc" ] || rm -f $${dest}/DOC* ; \ |
| 533 | find $${dest} -exec chown $${installuser} {} ';' ;\ | 533 | find $${dest} -exec chown $${installuser} {} ';' ;\ |
| 534 | for subdir in `find $${dest} -type d -print` ; do \ | 534 | for subdir in `find $${dest} -type d -print` ; do \ |
| 535 | chmod a+rx $${subdir} ; \ | ||
| 536 | rm -f $${subdir}/.gitignore ; \ | 535 | rm -f $${subdir}/.gitignore ; \ |
| 537 | rm -f $${subdir}/.arch-inventory ; \ | 536 | rm -f $${subdir}/.arch-inventory ; \ |
| 538 | rm -f $${subdir}/.DS_Store ; \ | 537 | rm -f $${subdir}/.DS_Store ; \ |
| @@ -546,7 +545,7 @@ install-arch-indep: install-leim install-info install-man ${INSTALL_ARCH_INDEP_E | |||
| 546 | done) ; \ | 545 | done) ; \ |
| 547 | done | 546 | done |
| 548 | -rm -f $(DESTDIR)${lispdir}/subdirs.el | 547 | -rm -f $(DESTDIR)${lispdir}/subdirs.el |
| 549 | $(srcdir)/update-subdirs $(DESTDIR)${lispdir} | 548 | umask 022; $(srcdir)/update-subdirs $(DESTDIR)${lispdir} |
| 550 | subdir=$(DESTDIR)${datadir}/emacs/${version}/site-lisp ; \ | 549 | subdir=$(DESTDIR)${datadir}/emacs/${version}/site-lisp ; \ |
| 551 | ${write_subdir} | 550 | ${write_subdir} |
| 552 | subdir=$(DESTDIR)${datadir}/emacs/site-lisp ; \ | 551 | subdir=$(DESTDIR)${datadir}/emacs/site-lisp ; \ |
| @@ -560,6 +559,8 @@ install-arch-indep: install-leim install-info install-man ${INSTALL_ARCH_INDEP_E | |||
| 560 | done ) | 559 | done ) |
| 561 | -chmod -R a+r $(DESTDIR)${datadir}/emacs/${version} ${COPYDESTS} | 560 | -chmod -R a+r $(DESTDIR)${datadir}/emacs/${version} ${COPYDESTS} |
| 562 | 561 | ||
| 562 | # The last chmod isn't needed at present. | ||
| 563 | |||
| 563 | ## We install only the relevant DOC file if possible | 564 | ## We install only the relevant DOC file if possible |
| 564 | ## (ie DOC-${version}.buildnumber), otherwise DOC-${version}*. | 565 | ## (ie DOC-${version}.buildnumber), otherwise DOC-${version}*. |
| 565 | ## (Note "otherwise" is inaccurate since 2009-08-23.) | 566 | ## (Note "otherwise" is inaccurate since 2009-08-23.) |