diff options
| author | Glenn Morris | 2013-03-04 19:43:52 -0800 |
|---|---|---|
| committer | Glenn Morris | 2013-03-04 19:43:52 -0800 |
| commit | b3cdfd9e06a5647767fbbb6448da6f9039fbf787 (patch) | |
| tree | a24d2b4c9ca21586b3db692f9882f58d61cfae76 | |
| parent | a318f81169dc608d407a48a445ccdb16118b81d0 (diff) | |
| download | emacs-b3cdfd9e06a5647767fbbb6448da6f9039fbf787.tar.gz emacs-b3cdfd9e06a5647767fbbb6448da6f9039fbf787.zip | |
* Makefile.in (install-man): Ignore gzip exit status.
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | Makefile.in | 8 |
2 files changed, 11 insertions, 1 deletions
| @@ -1,3 +1,7 @@ | |||
| 1 | 2013-03-05 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * Makefile.in (install-man): Ignore gzip exit status. | ||
| 4 | |||
| 1 | 2013-02-14 Paul Eggert <eggert@cs.ucla.edu> | 5 | 2013-02-14 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 6 | ||
| 3 | Fix AIX port (Bug#13650). | 7 | Fix AIX port (Bug#13650). |
diff --git a/Makefile.in b/Makefile.in index 9f1e9707d1d..01eb409b454 100644 --- a/Makefile.in +++ b/Makefile.in | |||
| @@ -621,6 +621,12 @@ install-info: info | |||
| 621 | ${INSTALL_INFO} --info-dir=$(DESTDIR)${infodir} $(DESTDIR)${infodir}/$$elt); \ | 621 | ${INSTALL_INFO} --info-dir=$(DESTDIR)${infodir} $(DESTDIR)${infodir}/$$elt); \ |
| 622 | done) | 622 | done) |
| 623 | 623 | ||
| 624 | ## "gzip || true" is because some gzips exit with non-zero status | ||
| 625 | ## if compression would not reduce the file size. Eg, the gzip in | ||
| 626 | ## OpenBSD 4.9 seems to do this (2013/03). In Emacs, this can | ||
| 627 | ## only happen with the tiny ctags.1 manpage. We don't really care if | ||
| 628 | ## ctags.1 is compressed or not. "gzip -f" is another option here, | ||
| 629 | ## but not sure if portable. | ||
| 624 | install-man: | 630 | install-man: |
| 625 | umask 022; ${MKDIR_P} $(DESTDIR)${man1dir} | 631 | umask 022; ${MKDIR_P} $(DESTDIR)${man1dir} |
| 626 | thisdir=`/bin/pwd`; \ | 632 | thisdir=`/bin/pwd`; \ |
| @@ -631,7 +637,7 @@ install-man: | |||
| 631 | ${INSTALL_DATA} ${mansrcdir}/$${page} $(DESTDIR)${man1dir}/$${dest}); \ | 637 | ${INSTALL_DATA} ${mansrcdir}/$${page} $(DESTDIR)${man1dir}/$${dest}); \ |
| 632 | ( [ -n "${GZIP_INFO}" ] && [ -n "${GZIP_PROG}" ] ) || continue ; \ | 638 | ( [ -n "${GZIP_INFO}" ] && [ -n "${GZIP_PROG}" ] ) || continue ; \ |
| 633 | rm -f $(DESTDIR)${man1dir}/$${dest}.gz; \ | 639 | rm -f $(DESTDIR)${man1dir}/$${dest}.gz; \ |
| 634 | ${GZIP_PROG} -9n $(DESTDIR)${man1dir}/$${dest}; \ | 640 | ${GZIP_PROG} -9n $(DESTDIR)${man1dir}/$${dest} || true; \ |
| 635 | done | 641 | done |
| 636 | 642 | ||
| 637 | ## Install those items from etc/ that need to end up elsewhere. | 643 | ## Install those items from etc/ that need to end up elsewhere. |