diff options
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/Makefile.in b/Makefile.in index 2959c9d7e12..8f4ba68c178 100644 --- a/Makefile.in +++ b/Makefile.in @@ -311,7 +311,7 @@ blessmail: ${SUBDIR_MAKEFILES} src FRC Makefile: $(srcdir)/Makefile.in config.status ./config.status -config.status: ${srcdir}/configure +config.status: ${srcdir}/configure ${srcdir}/lisp/version.el ./config.status --recheck AUTOCONF_INPUTS = @MAINT@ $(srcdir)/configure.in $(srcdir)/m4/getopt.m4 @@ -409,10 +409,8 @@ install-arch-dep: mkdir ## Note that we copy DOC* and then delete DOC ## as a workaround for a bug in tar on Ultrix 4.2. -## FIXME -## Should only install the DOC- file appropriate to this build, not DOC-*. -## 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 @@ -474,8 +472,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); \ |