From: Glenn Morris <rgm@gnu.org>
Date: Thu, 7 Jun 2007 08:02:18 +0000 (+0000)
Subject: (install-arch-indep): Install only the DOC- file specific to the
X-Git-Tag: emacs-pretest-23.0.90~12427
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=244ccd6218d3a353543521436d447fe0e41234e0;p=emacs.git

(install-arch-indep): Install only the DOC- file specific to the
build, if possible, rather than DOC-*.
---

diff --git a/Makefile.in b/Makefile.in
index 10fedcce82e..41a3436b45b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -414,6 +414,9 @@ install-arch-dep: mkdir
 ## 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 @@ install-arch-indep: mkdir info
 	-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); \