[Emacs-diffs] emacs ChangeLog Makefile.in

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       09/09/09 02:34:17

Modified files:
        .              : ChangeLog Makefile.in 

Log message:
        (install-arch-indep): Don't recursively change perms of
        site-lisp and infodir.  There may be non-Emacs files in here, and the
        files supplied by Emacs are all handled explicitly already.  (Bug#3800)
        (mkdir): Set umask to world-readable before creating directories.
        mkinstalldirs already checks if dirs exist, don't duplicate this test.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/ChangeLog?cvsroot=emacs&r1=1.848&r2=1.849
http://cvs.savannah.gnu.org/viewcvs/emacs/Makefile.in?cvsroot=emacs&r1=1.378&r2=1.379

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/ChangeLog,v
retrieving revision 1.848
retrieving revision 1.849
diff -u -b -r1.848 -r1.849
--- ChangeLog   29 Aug 2009 02:18:03 -0000      1.848
+++ ChangeLog   9 Sep 2009 02:34:17 -0000       1.849
@@ -1,3 +1,11 @@
+2009-09-09  Glenn Morris  <address@hidden>
+
+       * Makefile.in (install-arch-indep): Don't recursively change perms of
+       site-lisp and infodir.  There may be non-Emacs files in here, and the
+       files supplied by Emacs are all handled explicitly already.  (Bug#3800)
+       (mkdir): Set umask to world-readable before creating directories.
+       mkinstalldirs already checks if dirs exist, don't duplicate this test.
+
 2009-08-29  Glenn Morris  <address@hidden>
 
        * Makefile.in (info-real): Don't ignore errors from doc Makefiles.

Index: Makefile.in
===================================================================
RCS file: /sources/emacs/emacs/Makefile.in,v
retrieving revision 1.378
retrieving revision 1.379
diff -u -b -r1.378 -r1.379
--- Makefile.in 29 Aug 2009 02:21:54 -0000      1.378
+++ Makefile.in 9 Sep 2009 02:34:17 -0000       1.379
@@ -587,7 +587,7 @@
             ${INSTALL_INFO} --info-dir=$(DESTDIR)${infodir} 
$(DESTDIR)${infodir}/$$elt); \
          done; \
        else true; fi
-       -chmod -R a+r $(DESTDIR)${datadir}/emacs/${version} 
$(DESTDIR)${datadir}/emacs/site-lisp ${COPYDESTS} $(DESTDIR)${infodir}
+       -chmod -R a+r $(DESTDIR)${datadir}/emacs/${version} ${COPYDESTS}
        thisdir=`/bin/pwd`; \
        cd ${mansrcdir}; \
        for page in ${MAN_PAGES}; do \
@@ -623,11 +623,10 @@
 ### we may be creating several layers of directories (for example,
 ### /usr/local/lib/emacs/19.0/mips-dec-ultrix4.2), we use mkinstalldirs
 ### instead of mkdir.  Not all systems' mkdir programs have the `-p' flag.
+### We set the umask so that any created directories are world-readable.
+### FIXME it would be good to warn about non-standard permissions of
+### pre-existing directories, but that does not seem easy.
 mkdir: FRC
-       if [ -d $(DESTDIR)${datadir} ]; then true; else \
-         $(srcdir)/mkinstalldirs $(DESTDIR)${datadir}; \
-         chmod a+r $(DESTDIR)${datadir};\
-       fi
        icondirs= ; \
        for dir in $(iconsrcdir)/*/*/apps $(iconsrcdir)/*/*/mimetypes; do \
          if [ -d $${dir} ]; then \
@@ -635,7 +634,9 @@
          fi ; \
        done ; \
        icondirs=`echo "$${icondirs}" | sed 
's,$(srcdir)/etc/images/icons,$(DESTDIR)${icondir},g'` ; \
-       $(srcdir)/mkinstalldirs ${COPYDESTS} $(DESTDIR)${infodir} 
$(DESTDIR)${man1dir} \
+       umask 022 ; \
+       $(srcdir)/mkinstalldirs $(DESTDIR)${datadir} ${COPYDESTS} \
+         $(DESTDIR)${infodir} $(DESTDIR)${man1dir} \
          $(DESTDIR)${bindir} $(DESTDIR)${docdir} $(DESTDIR)${libexecdir} \
          $(DESTDIR)${datadir}/emacs/site-lisp \
          $(DESTDIR)${datadir}/emacs/${version}/site-lisp \
@@ -643,8 +644,7 @@
          $(DESTDIR)${desktopdir} $${icondirs}
 
 ### Delete all the installed files that the `install' target would
-### create (but not the noninstalled files such as `make all' would
-### create).
+### create (but not the noninstalled files such as `make all' would create).
 ###
 ### Don't delete the lisp and etc directories if they're in the source tree.
 uninstall: