summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2013-03-04 19:43:52 -0800
committerGlenn Morris <rgm@gnu.org>2013-03-04 19:43:52 -0800
commitb3cdfd9e06a5647767fbbb6448da6f9039fbf787 (patch)
treea24d2b4c9ca21586b3db692f9882f58d61cfae76
parenta318f81169dc608d407a48a445ccdb16118b81d0 (diff)
downloademacs-b3cdfd9e06a5647767fbbb6448da6f9039fbf787.tar.gz
* Makefile.in (install-man): Ignore gzip exit status.
-rw-r--r--ChangeLog4
-rw-r--r--Makefile.in8
2 files changed, 11 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 6bd8f213c17..fd524c6955b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-03-05 Glenn Morris <rgm@gnu.org>
+
+ * Makefile.in (install-man): Ignore gzip exit status.
+
2013-02-14 Paul Eggert <eggert@cs.ucla.edu>
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
${INSTALL_INFO} --info-dir=$(DESTDIR)${infodir} $(DESTDIR)${infodir}/$$elt); \
done)
+## "gzip || true" is because some gzips exit with non-zero status
+## if compression would not reduce the file size. Eg, the gzip in
+## OpenBSD 4.9 seems to do this (2013/03). In Emacs, this can
+## only happen with the tiny ctags.1 manpage. We don't really care if
+## ctags.1 is compressed or not. "gzip -f" is another option here,
+## but not sure if portable.
install-man:
umask 022; ${MKDIR_P} $(DESTDIR)${man1dir}
thisdir=`/bin/pwd`; \
@@ -631,7 +637,7 @@ install-man:
${INSTALL_DATA} ${mansrcdir}/$${page} $(DESTDIR)${man1dir}/$${dest}); \
( [ -n "${GZIP_INFO}" ] && [ -n "${GZIP_PROG}" ] ) || continue ; \
rm -f $(DESTDIR)${man1dir}/$${dest}.gz; \
- ${GZIP_PROG} -9n $(DESTDIR)${man1dir}/$${dest}; \
+ ${GZIP_PROG} -9n $(DESTDIR)${man1dir}/$${dest} || true; \
done
## Install those items from etc/ that need to end up elsewhere.