summaryrefslogtreecommitdiff
path: root/Makefile.in
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2007-06-07 08:02:18 +0000
committerGlenn Morris <rgm@gnu.org>2007-06-07 08:02:18 +0000
commit244ccd6218d3a353543521436d447fe0e41234e0 (patch)
tree37ba796dc5170dc36c1ba1a17397c141154d35e3 /Makefile.in
parent924e4ab0e8ba9323f878f2ea8bfa18da72d2a408 (diff)
downloademacs-244ccd6218d3a353543521436d447fe0e41234e0.tar.gz
(install-arch-indep): Install only the DOC- file specific to the
build, if possible, rather than DOC-*.
Diffstat (limited to 'Makefile.in')
-rw-r--r--Makefile.in14
1 files changed, 12 insertions, 2 deletions
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); \