aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2013-01-15 20:41:31 -0500
committerGlenn Morris2013-01-15 20:41:31 -0500
commit94898d72a3f26c17db362e8d81fd3b6d8fac582b (patch)
tree65a8684124d01e1b33884b9267e90648ee0c0d13
parent2e7a1892492d450d1fdf52cc704dd8f5d3a9cb18 (diff)
downloademacs-94898d72a3f26c17db362e8d81fd3b6d8fac582b.tar.gz
emacs-94898d72a3f26c17db362e8d81fd3b6d8fac582b.zip
* Makefile.in (install-arch-indep): Put back a chmod
that was removed 2012-05-19. (Bug#13430)
-rw-r--r--ChangeLog5
-rw-r--r--Makefile.in5
2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 05d15b7dc36..cddaaa58a5f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
12013-01-16 Glenn Morris <rgm@gnu.org>
2
3 * Makefile.in (install-arch-indep): Put back a chmod that was
4 removed 2012-05-19. (Bug#13430)
5
12013-01-10 Glenn Morris <rgm@gnu.org> 62013-01-10 Glenn Morris <rgm@gnu.org>
2 7
3 * make-dist: Add options for xz compression and no compression. 8 * make-dist: Add options for xz compression and no compression.
diff --git a/Makefile.in b/Makefile.in
index 2916aeccd70..9f1e9707d1d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -534,6 +534,7 @@ install-arch-indep: lisp leim install-info install-man ${INSTALL_ARCH_INDEP_EXTR
534 tar -xvf - && cat > /dev/null) || exit 1; \ 534 tar -xvf - && cat > /dev/null) || exit 1; \
535 [ "$${dir}" != "${srcdir}/etc" ] || rm -f $${dest}/DOC* ; \ 535 [ "$${dir}" != "${srcdir}/etc" ] || rm -f $${dest}/DOC* ; \
536 for subdir in `find $${dest} -type d -print` ; do \ 536 for subdir in `find $${dest} -type d -print` ; do \
537 chmod a+rx $${subdir} ; \
537 rm -f $${subdir}/.gitignore ; \ 538 rm -f $${subdir}/.gitignore ; \
538 rm -f $${subdir}/.arch-inventory ; \ 539 rm -f $${subdir}/.arch-inventory ; \
539 rm -f $${subdir}/.DS_Store ; \ 540 rm -f $${subdir}/.DS_Store ; \
@@ -568,7 +569,9 @@ install-arch-indep: lisp leim install-info install-man ${INSTALL_ARCH_INDEP_EXTR
568 done ) 569 done )
569 -chmod -R a+r $(DESTDIR)${datadir}/emacs/${version} ${COPYDESTS} 570 -chmod -R a+r $(DESTDIR)${datadir}/emacs/${version} ${COPYDESTS}
570 571
571# The last chmod isn't needed at present. 572## The above chmods are needed because "umask 022; tar ..." is not
573## guaranteed to do the right thing; eg if we are root and tar is
574## preserving source permissions.
572 575
573## We install only the relevant DOC file if possible 576## We install only the relevant DOC file if possible
574## (ie DOC-${version}.buildnumber), otherwise DOC-${version}*. 577## (ie DOC-${version}.buildnumber), otherwise DOC-${version}*.