Fix compilation for lack of docbook2x-man

The guard in doc/Makefile.am was supposed to protect against
publishing release tarballs lacking a compiled xmlwf.1 man page
without noticing.  Now it does no more than advertised.

diff --git a/expat/Changes b/expat/Changes
index e5f478388335ca221f26adff18c2f1a49e7df7c3..49eb7ee2d22b256e05d01059335f2af1bf4effc2 100644 (file)
--- a/expat/Changes
+++ b/expat/Changes
@@ -12,6 +12,7 @@ Release x.x.x XXX XXXXXX XX XXXX
             #228  Autotools: Modernize configure.ac
             #243  Windows: Fix syntax of .def module definition files
        #245 #246  Autotools: Fix check for -fvisibility=hidden for Clang
+       #247 #248  Autotools: Fix compilation for lack of docbook2x-man
 
         Special thanks to:
             Benjamin Peterson

diff --git a/expat/doc/Makefile.am b/expat/doc/Makefile.am
index d8a35c0da235691b20663470babe3700443ff30d..e2f029837a410e92a497b68ade5ee77b97bb7eb5 100644 (file)
--- a/expat/doc/Makefile.am
+++ b/expat/doc/Makefile.am
@@ -28,14 +28,17 @@
 # OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 # USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+.PHONY: dist-hook  # not inside conditional to avoid automake warning
+
+if WITH_DOCBOOK
 dist_man_MANS = xmlwf.1
 
 xmlwf.1: xmlwf.xml
-if WITH_DOCBOOK
        -rm -f $@
        $(DOCBOOK_TO_MAN) $<
        test -f $@ || mv XMLWF.1 $@
 else
+dist-hook:
        @echo 'ERROR: Configure with --with-docbook for "make dist".' 1>&2
        @false
 endif