Fix docbook

diff --git a/expat/CMakeLists.txt b/expat/CMakeLists.txt
index f8ed83eed7aad419565c649fcce70332a59a41a4..9a9df09a41a9908ea87137d276889defebcee1c7 100644 (file)
--- a/expat/CMakeLists.txt
+++ b/expat/CMakeLists.txt
@@ -18,7 +18,7 @@ endif()
 if(MSVC OR NOT BUILD_tools_default)\r
     set(BUILD_doc_default OFF)\r
 else()\r
-    find_program(DOCBOOK_TO_MAN NAMES docbook2x-man)\r
+    find_program(DOCBOOK_TO_MAN NAMES docbook2x-man docbook2man)\r
     if(DOCBOOK_TO_MAN)\r
         set(BUILD_doc_default ON)\r
     else()\r
@@ -155,13 +155,7 @@ if(BUILD_tools)
     target_link_libraries(xmlwf expat)\r
     expat_install(TARGETS xmlwf DESTINATION bin)\r
     if(BUILD_doc)\r
-        if(CMAKE_GENERATOR STREQUAL "Unix Makefiles")\r
-            set(make_command "$(MAKE)")\r
-        else()\r
-            set(make_command "make")\r
-        endif()\r
-\r
-        add_custom_command(TARGET expat PRE_BUILD COMMAND "${make_command}" -f "${PROJECT_SOURCE_DIR}/doc/doc.mk" -C "${PROJECT_SOURCE_DIR}/doc" xmlwf.1 "DOCBOOK_TO_MAN=${DOCBOOK_TO_MAN}")\r
+        add_custom_command(TARGET expat PRE_BUILD COMMAND "${DOCBOOK_TO_MAN}" "${PROJECT_SOURCE_DIR}/doc/xmlwf.xml" && mv "XMLWF.1" "${PROJECT_SOURCE_DIR}/doc/xmlwf.1")\r
         expat_install(FILES "${PROJECT_SOURCE_DIR}/doc/xmlwf.1" DESTINATION share/man/man1)\r
     endif()\r
 endif()\r

diff --git a/expat/configure.ac b/expat/configure.ac
index 5388ca7e520d0e6e2eb11cc6307f922ffc97a3a3..1f7deded07d2a502588571b2df8c06177f1ddf4e 100644 (file)
--- a/expat/configure.ac
+++ b/expat/configure.ac
@@ -228,6 +228,20 @@ AS_IF([test "x${enable_xml_context}" != "xno"], [
     [Define to specify how much context to retain around the current parse point.])
 ])
 
+AC_ARG_WITH([docbook],
+  [AS_HELP_STRING([--with-docbook],
+    [support xml to man page generation @<:@default=check@:>@])],
+  [],
+  [with_docbook=check])
+
+DOCBOOK_TO_MAN=
+AS_IF([test "x$with_docbook" != xno],
+  [AC_CHECK_PROGS([DOCBOOK_TO_MAN], [docbook2x-man docbook2man],
+  [if test "x$with_docbook" != xcheck; then 
+    AC_MSG_ERROR([Required program 'docbook2x-man' not found.])])])
+
+AM_CONDITIONAL(WITH_DOCBOOK, [test x${DOCBOOK_TO_MAN} != x])
+
 AC_CONFIG_FILES([Makefile expat.pc])
 AC_CONFIG_FILES([
   doc/Makefile

diff --git a/expat/doc/Makefile.am b/expat/doc/Makefile.am
index 8bb74e3c79381b47763f06fee692f0fc32af54ff..af22654636f87b32ee94960d5e3b70f0f69c586e 100644 (file)
--- a/expat/doc/Makefile.am
+++ b/expat/doc/Makefile.am
@@ -28,10 +28,12 @@
 # OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 # USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+if WITH_DOCBOOK
 dist_man_MANS = xmlwf.1
 
-xmlwf.1: doc.mk xmlwf.xml
-       $(MAKE) -f $(srcdir)/doc.mk xmlwf.1 srcdir=$(srcdir)
+xmlwf.1: xmlwf.xml
+       ${DOCBOOK_TO_MAN} $<
+       mv XMLWF.1 $@
 
 # https://www.gnu.org/software/automake/manual/automake.html#What-Gets-Cleaned
 .PHONY: clean-local
@@ -39,12 +41,12 @@ clean-local: clean-local-check
 
 .PHONY: clean-local-check
 clean-local-check:
-       $(MAKE) -f $(srcdir)/doc.mk clean
+       $(RM) ${dist_man_MANS}
 
 EXTRA_DIST = \
-    doc.mk \
     expat.png \
     reference.html \
     style.css \
     valid-xhtml10.png \
     xmlwf.xml
+endif

diff --git a/expat/doc/doc.mk b/expat/doc/doc.mk
deleted file mode 100644 (file)
index 828bc7f..0000000
--- a/expat/doc/doc.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright (C) Sebastian Pipping <sebastian@pipping.org>
-# Licensed under MIT/X License
-
-DOCBOOK_TO_MAN = docbook2x-man
-
-srcdir = .
-
-
-.PHONY: all
-all: xmlwf.1
-
-xmlwf.1: XMLWF.1
-       cp $< $@
-
-XMLWF.1: $(srcdir)/xmlwf.xml
-       $(DOCBOOK_TO_MAN) $(srcdir)/xmlwf.xml
-
-.PHONY: clean
-clean:
-       $(RM) xmlwf.1 XMLWF.1