Merge from emacs--rel--22

[gnu-emacs] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 7bfa79008285a780083bfe1c93cb1742a90c0a86..10fedcce82e98fe98e41e5e68862dca97d8ec815 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -2,8 +2,8 @@
 # DIST: make most of the changes to this file you might want, so try
 # DIST: that first.
 
-# Copyright (C) 1992,93,94,95,96,97,98,1999,2000,01,02,03,04,2005,2006
-#   Free Software Foundation, Inc.
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+#   2001, 2002, 2003, 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
@@ -110,6 +110,10 @@ exec_prefix=@exec_prefix@
 # run directly (like etags).
 bindir=@bindir@
 
+# The root of the directory tree for read-only architecture-independent
+# data files.  ${datadir}, ${infodir} and ${mandir} are based on this.
+datarootdir=@datarootdir@
+
 # Where to install architecture-independent data files.         ${lispdir}
 # and ${etcdir} are subdirectories of this.
 datadir=@datadir@
@@ -307,7 +311,7 @@ blessmail: ${SUBDIR_MAKEFILES} src FRC
 Makefile: $(srcdir)/Makefile.in config.status
        ./config.status
 
-config.status: ${srcdir}/configure
+config.status: ${srcdir}/configure ${srcdir}/lisp/version.el
        ./config.status --recheck
 
 AUTOCONF_INPUTS = @MAINT@ $(srcdir)/configure.in $(srcdir)/m4/getopt.m4
@@ -400,11 +404,16 @@ install-arch-dep: mkdir
 ### Install the files that are machine-independent.
 ### Most of them come straight from the distribution;
 ### the exception is the DOC-* files, which are copied
-## from the build directory.
+### from the build directory.
 
 ## Note that we copy DOC* and then delete DOC
 ## as a workaround for a bug in tar on Ultrix 4.2.
 
+## FIXME
+## Should only install the DOC- file appropriate to this build, not DOC-*.
+## http://lists.gnu.org/archive/html/emacs-pretest-bug/2007-01/msg00417.html
+## (fix available for consideration post-release).
+
 ## If people complain about the h flag in tar command, take that out.
 ## That flag is also used in leim/Makefile.in
 install-arch-indep: mkdir info
@@ -518,7 +527,7 @@ install-arch-indep: mkdir info
             ${INSTALL_INFO} --info-dir=$(DESTDIR)${infodir} $(DESTDIR)${infodir}/$$elt); \
          done; \
        else true; fi
-       -chmod -R a+r $(DESTDIR)${datadir}/emacs ${COPYDESTS} $(DESTDIR)${infodir}
+       -chmod -R a+r $(DESTDIR)${datadir}/emacs/${version} $(DESTDIR)${datadir}/emacs/site-lisp ${COPYDESTS} $(DESTDIR)${infodir}
        thisdir=`/bin/pwd`; \
        cd ${srcdir}/etc; \
        for page in emacs emacsclient etags ctags ; do \