[Emacs-diffs] /srv/bzr/emacs/trunk r108192: * Makefile.in (install-arch-indep): There are no more Makefile.c files.

[Glenn Morris]

------------------------------------------------------------
revno: 108192
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Fri 2012-05-11 00:51:31 -0700
message:
  * Makefile.in (install-arch-indep): There are no more Makefile.c files.
modified:
  ChangeLog
  Makefile.in

=== modified file 'ChangeLog'
--- a/ChangeLog 2012-05-10 03:40:20 +0000
+++ b/ChangeLog 2012-05-11 07:51:31 +0000
@@ -1,3 +1,7 @@
+2012-05-11  Glenn Morris  <address@hidden>
+
+       * Makefile.in (install-arch-indep): There are no more Makefile.c files.
+
 2012-05-10  Glenn Morris  <address@hidden>
 
        * configure.in (LEIM_INSTALLDIR): New output variable.

=== modified file 'Makefile.in'
--- a/Makefile.in       2012-05-04 06:45:03 +0000
+++ b/Makefile.in       2012-05-11 07:51:31 +0000
@@ -495,9 +495,17 @@
 
 ## 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 @@
                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