[Emacs-diffs] Changes to emacs/Makefile.in,v

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       07/06/07 08:02:18

Index: Makefile.in
===================================================================
RCS file: /sources/emacs/emacs/Makefile.in,v
retrieving revision 1.322
retrieving revision 1.323
diff -u -b -r1.322 -r1.323
--- Makefile.in 27 Apr 2007 15:13:59 -0000      1.322
+++ Makefile.in 7 Jun 2007 08:02:18 -0000       1.323
@@ -414,6 +414,9 @@
 ## http://lists.gnu.org/archive/html/emacs-pretest-bug/2007-01/msg00417.html
 ## (fix available for consideration post-release).
 
+## We install only the relevant DOC file if possible
+## (ie DOC-${version}.buildnumber), otherwise DOC-${version}*.
+
 ## 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
@@ -474,8 +477,15 @@
        -unset CDPATH; \
        if [ `(cd ./etc; /bin/pwd)` != `(cd $(DESTDIR)${docdir}; /bin/pwd)` ]; \
        then \
-          echo "Copying etc/DOC-* to $(DESTDIR)${docdir} ..." ; \
-          (cd ./etc; tar -chf - DOC*) \
+          fullversion=`./src/emacs --version | sed -n '1 s/GNU Emacs *//p'`; \
+          if [ -f "./etc/DOC-$${fullversion}" ]; \
+          then \
+            docfile="DOC-$${fullversion}"; \
+          else \
+            docfile="DOC-${version}*"; \
+          fi; \
+          echo "Copying etc/$${docfile} to $(DESTDIR)${docdir} ..." ; \
+          (cd ./etc; tar -chf - $${docfile}) \
             |(cd $(DESTDIR)${docdir}; umask 022; tar -xvf - && cat > 
/dev/null) || exit 1; \
           (cd $(DESTDIR)$(docdir); chown $${LOGNAME:-$$USERNAME} DOC*; chmod 
a+r DOC*; \
            if test "`echo DOC-*`" != "DOC-*"; then rm DOC; fi); \