From cad11bdd2b596aa680317079c468f95c6a955c67 Mon Sep 17 00:00:00 2001 From: Guido Draheim Date: Thu, 21 May 2009 17:29:05 +0000 Subject: [PATCH] allow "ar x" to fail during make install-docs install-man3 (fixes ticket:2716806) --- ChangeLog | 9 +++++++++ docs/Makefile.am | 6 ++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 118feaa..a2143a1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2009-05-21 guidod + + * docs/Makefile.am: make install-docs install-man3 rules so that + a failing "ar x" (on OpenBSD/vax) will not kill the whole + configure / make / make install cycle. However it simply + means that there will be no manpages on such platforms. + May be OpenBSD/vax has a "gar" (gnu ar) installed somewhere? + * closes Patches item #2716806, was opened at 2009-03-27 13:01 + 2009-05-21 guidod * zzip/fetch.h: ensure that either direct-bswap or direc-deref is only used on platforms that do not require aligned memory access. The diff --git a/docs/Makefile.am b/docs/Makefile.am index 9f15842..c540d56 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -100,7 +100,8 @@ install-docs: $(doc_FILES) $(man_FILES) site.html htmpages.ar $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)/man @ echo ar x htmpages.ar '>>>' $(DESTDIR)$(pkgdocdir)/man/ \ ; test -f htmpages.ar || cd "$srcdir" ; P=`pwd` \ - ; cd $(DESTDIR)$(pkgdocdir)/man && ar x $$P/htmpages.ar + ; cd $(DESTDIR)$(pkgdocdir)/man && ar x $$P/htmpages.ar \ + ; true install-doc : install-docs $(PACKAGE)-doc.omf $(mkinstalldirs) $(DESTDIR)$(pkgomfdir) @@ -172,7 +173,8 @@ htmpages.ar : zziplib.xml zzipmmapped.xml zzipfseeko.xml zziplib-manpages.dbk install-man3 : manpages.ar $(mkinstalldirs) $(DESTDIR)$(mandir)/man3 P=`pwd` ; cd $(DESTDIR)$(mandir)/man3 \ - && ar x $$P/manpages.ar + && ar x $$P/manpages.ar \ + ; true unpack : manpages.ar htmpages.ar (rm -rf _htm && mkdir _htm && cd _htm && ar x ../htmpages.ar) -- 2.40.0