aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKen Raeburn2009-08-23 03:54:32 +0000
committerKen Raeburn2009-08-23 03:54:32 +0000
commit201a407332e00f12a53ea87aa107860c813c30c2 (patch)
treeb262d3b232feab6394cdf8e4d1c2c6e79f326989
parent879de935e0362c00955b406c7291953db01e0b95 (diff)
downloademacs-201a407332e00f12a53ea87aa107860c813c30c2.tar.gz
emacs-201a407332e00f12a53ea87aa107860c813c30c2.zip
* Makefile.in (install-arch-indep): If the versioned DOC-####
generated during loadup+dump isn't found, install the plain DOC file that always gets generated, in case CANNOT_DUMP is set.
-rw-r--r--ChangeLog6
-rw-r--r--Makefile.in2
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 2b04c8264f4..adf190621ed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
12009-08-23 Ken Raeburn <raeburn@mit.edu> 12009-08-23 Ken Raeburn <raeburn@raeburn.org>
2
3 * Makefile.in (install-arch-indep): If the versioned DOC-####
4 generated during loadup+dump isn't found, install the plain DOC
5 file that always gets generated, in case CANNOT_DUMP is set.
2 6
3 * configure.in: Warn if package version specified here doesn't 7 * configure.in: Warn if package version specified here doesn't
4 match the version in version.el. 8 match the version in version.el.
diff --git a/Makefile.in b/Makefile.in
index 44c5cba7d9c..a3ddec80253 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -526,7 +526,7 @@ install-arch-indep: mkdir info install-etc
526 then \ 526 then \
527 docfile="DOC-$${fullversion}"; \ 527 docfile="DOC-$${fullversion}"; \
528 else \ 528 else \
529 docfile="DOC-${version}*"; \ 529 docfile="DOC"; \
530 fi; \ 530 fi; \
531 echo "Copying etc/$${docfile} to $(DESTDIR)${docdir} ..." ; \ 531 echo "Copying etc/$${docfile} to $(DESTDIR)${docdir} ..." ; \
532 (cd ./etc; tar -chf - $${docfile}) \ 532 (cd ./etc; tar -chf - $${docfile}) \