Fix glitch in scrolling_window (backport from trunk).

[bpt/emacs.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 80995cd..32a09ff 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -3,7 +3,7 @@
 # DIST: that first.
 
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-#   2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+#   2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
 #   Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
@@ -140,11 +140,11 @@ MAN_PAGES=b2m.1 ctags.1 ebrowse.1 emacs.1 emacsclient.1 etags.1 \
 # system, it is inappropriate to imply that it is part of Emacs.
 infodir=@infodir@
 INFO_FILES=ada-mode auth autotype calc ccmode cl dbus dired-x ebrowse  \
-           ediff efaq eintr elisp emacs emacs-mime epa erc eshell eudc \
-           flymake forms gnus idlwave info mairix-el message mh-e      \
-           newsticker nxml-mode org pcl-cvs pgg rcirc reftex remember  \
-           sasl sc ses sieve smtpmail speedbar tramp url vip viper     \
-           widget woman
+           ede ediff edt eieio efaq eintr elisp emacs emacs-mime epa erc \
+          eshell eudc flymake forms gnus idlwave info mairix-el        \
+          message mh-e newsticker nxml-mode org pcl-cvs pgg rcirc      \
+          reftex remember sasl sc semantic ses sieve smtpmail speedbar \
+          tramp url vip viper widget woman
 
 # Directory for local state files for all programs.
 localstatedir=@localstatedir@
@@ -495,7 +495,8 @@ install-arch-indep: mkdir info install-etc
                rm -f  $${subdir}/*~ ; \
                rm -f  $${subdir}/*.orig ; \
                [ "$${dir}" != "${srcdir}/etc" ] && \
-                       rm -f  $${subdir}/[mM]akefile* ; \
+                rm -f $${subdir}/[mM]akefile*.c $${subdir}/[mM]akefile*[.-]in \
+                  $${subdir}/[mM]akefile ; \
                rm -f  $${subdir}/ChangeLog* ; \
                rm -f  $${subdir}/dired.todo ; \
              done) ; \
@@ -587,7 +588,7 @@ install-arch-indep: mkdir info install-etc
             ${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 +624,10 @@ install-strip:
 ### 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 +635,9 @@ mkdir: FRC
          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 +645,7 @@ mkdir: FRC
          $(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: