Use DocBook stylesheets from xorg-sgml-doctools if they're available
Bumps minimum xorg-macros requirement from 1.6 to 1.10 Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Patrick E. Kane <pekane52@gmail.com>
This commit is contained in:
parent
9fbbff3c04
commit
44c9350d72
|
@ -32,12 +32,13 @@ AC_CONFIG_SRCDIR([Makefile.am])
|
|||
AM_INIT_AUTOMAKE([foreign dist-bzip2])
|
||||
AM_MAINTAINER_MODE
|
||||
|
||||
# Require xorg-macros: XORG_DEFAULT_OPTIONS
|
||||
# Require xorg-macros minimum of 1.10 for XORG_CHECK_SGML_DOCTOOLS
|
||||
m4_ifndef([XORG_MACROS_VERSION],
|
||||
[m4_fatal([must install xorg-macros 1.6 or later before running autoconf/autogen])])
|
||||
XORG_MACROS_VERSION(1.6)
|
||||
[m4_fatal([must install xorg-macros 1.10 or later before running autoconf/autogen])])
|
||||
XORG_MACROS_VERSION(1.10)
|
||||
XORG_DEFAULT_OPTIONS
|
||||
XORG_WITH_DOXYGEN(1.6.1)
|
||||
XORG_CHECK_SGML_DOCTOOLS(1.5)
|
||||
|
||||
m4_ifndef([XORG_FONT_MACROS_VERSION], [m4_fatal([must install fontutil 1.1 or later before running autoconf/autogen])])
|
||||
XORG_FONT_MACROS_VERSION(1.1)
|
||||
|
|
|
@ -3,3 +3,4 @@ xserver.ent
|
|||
Xserver-spec.html
|
||||
Xserver-spec.pdf
|
||||
Xserver-spec.txt
|
||||
xorg.css
|
||||
|
|
|
@ -39,6 +39,14 @@ SUFFIXES = .xml .txt .html .pdf
|
|||
XML_ENT_DIR = $(abs_top_builddir)/doc/xml
|
||||
XMLTO_FLAGS = --searchpath $(XML_ENT_DIR)
|
||||
|
||||
if HAVE_STYLESHEETS
|
||||
XMLTO_FLAGS += -m $(XSL_STYLESHEET)
|
||||
BUILT_DOC_FILES += xorg.css
|
||||
|
||||
xorg.css: $(STYLESHEET_SRCDIR)/xorg.css
|
||||
$(AM_V_GEN)cp -pf $(STYLESHEET_SRCDIR)/xorg.css $@
|
||||
endif
|
||||
|
||||
if HAVE_XMLTO
|
||||
BUILT_DOC_FILES += $(TXT_FILES)
|
||||
.xml.txt:
|
||||
|
@ -59,7 +67,7 @@ endif
|
|||
|
||||
endif
|
||||
|
||||
CLEAN_DOC_FILES = $(TXT_FILES) $(HTML_FILES) $(PDF_FILES)
|
||||
CLEAN_DOC_FILES = $(TXT_FILES) $(HTML_FILES) $(PDF_FILES) xorg.css
|
||||
|
||||
# All the files we build depend on the entities
|
||||
$(BUILT_DOC_FILES): $(XML_ENT_DIR)/xserver.ent
|
||||
|
|
|
@ -3,3 +3,4 @@ DESIGN.html
|
|||
DESIGN.pdf
|
||||
DESIGN.ps
|
||||
DESIGN.txt
|
||||
xorg.css
|
||||
|
|
Loading…
Reference in New Issue