diff options
| author | bkoz <bkoz@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-03-08 00:04:05 +0000 |
|---|---|---|
| committer | bkoz <bkoz@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-03-08 00:04:05 +0000 |
| commit | dca897193190bd384a0e6dd8caf68d32fcd18ca1 (patch) | |
| tree | 2564fedfcbfbf259cb91eeef6699a97183bb9dc6 /libstdc++-v3/doc/Makefile.in | |
| parent | 91fa23854fbd2a37af78c274c4adb16dff54d1fe (diff) | |
| download | gcc-dca897193190bd384a0e6dd8caf68d32fcd18ca1.tar.gz | |
2011-03-07 Benjamin Kosnik <bkoz@redhat.com>
Matthias Klose <doko@ubuntu.com>
Jonathan Wakely <redi@gcc.gnu.org>
PR libstdc++/47145
* acinclude.m4 (GLIBCXX_CONFIGURE_DOCBOOK): Define.
* configure.ac: Use it.
* doc/Makefile.am (XSL_STYLE_DIR): Set at configure time.
* configure: Regenerate.
* doc/Makefile.in: Regenerate.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@170763 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/doc/Makefile.in')
| -rw-r--r-- | libstdc++-v3/doc/Makefile.in | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/libstdc++-v3/doc/Makefile.in b/libstdc++-v3/doc/Makefile.in index 60b1eb06d3f..e17773370d1 100644 --- a/libstdc++-v3/doc/Makefile.in +++ b/libstdc++-v3/doc/Makefile.in @@ -180,6 +180,7 @@ WERROR = @WERROR@ # Validate existing XML structure. XMLLINT = xmllint XSLTPROC = xsltproc +XSL_STYLE_DIR = @XSL_STYLE_DIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -418,22 +419,17 @@ xml_noinst = \ ${xml_dir}/images/confdeps.pdf XSLTPROC_FLAGS = --nonet --xinclude -#XSL_STYLE_DIR = /usr/share/sgml/docbook/xsl-stylesheets -XSL_STYLE_DIR = /usr/share/sgml/docbook/xsl-ns-stylesheets +#XSL_STYLE_DIR = /usr/share/xml/docbook/stylesheet/docbook-xsl-ns +#XSL_STYLE_DIR = /usr/share/sgml/docbook/xsl-ns-stylesheets XSL_FO_STYLE = $(XSL_STYLE_DIR)/fo/docbook.xsl -#XSL_HTML_STYLE = $(XSL_STYLE_DIR)/xhtml/chunk.xsl -#XSL_HTML_SINGLE_STYLE = $(XSL_STYLE_DIR)/xhtml/onechunk.xsl -#XSL_HTML_SINGLE_STYLE = $(XSL_STYLE_DIR)/xhtml/docbook.xsl XSL_HTML_STYLE = $(XSL_STYLE_DIR)/xhtml-1_1/chunk.xsl XSL_HTML_SINGLE_STYLE = $(XSL_STYLE_DIR)/xhtml-1_1/docbook.xsl XSL_EPUB_STYLE = $(XSL_STYLE_DIR)/epub/docbook.xsl -#LINT_FLAGS = --debug --xinclude --nsclean --postvalid --nowarning --nonet -#LINT_FLAGS = --xinclude --postvalid --noent --noblanks --noout -LINT_FLAGS = --debug --xinclude --noent --noblanks --nonet --noout -#SCHEMA_FLAGS = --relaxng /usr/share/xml/docbook5/schema/rng/5.0/docbookxi.rng -SCHEMA_FLAGS = --dtdvalid /usr/share/xml/docbook5/schema/dtd/5.0/docbook.dtd +LINT_FLAGS = --debug --xinclude --noent --noblanks --noout +SCHEMA_FLAGS = http://www.docbook.org/xml/5.0/dtd/docbook.dtd +#SCHEMA_FLAGS = --nonet /usr/share/xml/docbook5/schema/dtd/5.0/docbook.dtd +XMLLINT_VALID_FLAGS = $(LINT_FLAGS) --dtdvalid $(SCHEMA_FLAGS) XMLLINT_FLAGS = --xinclude --nsclean --c14n --noent --noblanks --nocdata -XMLLINT_VALID_FLAGS = $(LINT_FLAGS) $(SCHEMA_FLAGS) # XML, all one page # Some info on canonicalization |