* Makefile.in (install-arch-indep): There are no more Makefile.c files.

diff --git a/ChangeLog b/ChangeLog
index ae355df0c8b12b210a0efcc3d305db9af0ad3a79..61f29a9ee78b272d206f4b560929a279030e04ec 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-05-11  Glenn Morris  <rgm@gnu.org>
+
+       * Makefile.in (install-arch-indep): There are no more Makefile.c files.
+
 2012-05-10  Glenn Morris  <rgm@gnu.org>
 
        * configure.in (LEIM_INSTALLDIR): New output variable.

diff --git a/Makefile.in b/Makefile.in
index 62e98fd451aea7a8be461d126eff50973dda6ae9..a8271f0ec9d8d5f6181e8fed9bb12e144299c0f1 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -495,9 +495,17 @@ set_installuser=for installuser in $${LOGNAME} $${USERNAME} $${USER} \
 
 ## Note that we copy DOC* and then delete DOC
 ## as a workaround for a bug in tar on Ultrix 4.2.
+## Ultrix is no longer supported since 23.1, but the relevant line
+## has another effect.  We copy the entire etc/ directory from the
+## source tree first.  For an in-tree build, this will include
+## any DOC* files there may be.  So rm DOC does have an effect.
+## FIXME When we copy etc we should exclude DOC*, then copy only
+## the relevant one.  We cannot delete DOC* from the destination directory,
+## because that may include pre-existing files from another emacs.
 
 ## We install only the relevant DOC file if possible
 ## (ie DOC-${version}.buildnumber), otherwise DOC-${version}*.
+## (Note "otherwise" is inaccurate since 2009-08-23.)
 
 ## If people complain about the h flag in tar command, take that out.
 ## That flag is also used in leim/Makefile.in
@@ -538,8 +546,7 @@ install-arch-indep: mkdir info install-etc
                rm -f  $${subdir}/*~ ; \
                rm -f  $${subdir}/*.orig ; \
                [ "$${dir}" != "${srcdir}/etc" ] && \
-                rm -f $${subdir}/[mM]akefile*.c $${subdir}/[mM]akefile*[.-]in \
-                  $${subdir}/[mM]akefile ; \
+                rm -f $${subdir}/[mM]akefile*[.-]in $${subdir}/[mM]akefile ; \
                rm -f  $${subdir}/ChangeLog* ; \
              done) ; \
        done