|
 |
ddfbe9 |
commit e10da2c7bdb2992c26ca5313ee0d0dca22e2f792
|
|
|
ddfbe9 |
Author: Frank Ch. Eigler <fche@redhat.com>
|
|
|
ddfbe9 |
Date: Thu Feb 19 10:30:08 2015 -0500
|
|
|
ddfbe9 |
|
|
|
ddfbe9 |
PR17737: followup: more portable xmlto parametrization
|
|
|
ddfbe9 |
|
|
|
ddfbe9 |
Testing indicates --stringparam generate.toc='book,toc,title'
|
|
|
ddfbe9 |
works more portably than generate.toc='book\ toc,title'
|
|
|
ddfbe9 |
|
|
|
ddfbe9 |
diff --git a/doc/Makefile.in b/doc/Makefile.in
|
|
|
ddfbe9 |
index 0e38ffb..204eea1 100644
|
|
|
ddfbe9 |
--- a/doc/Makefile.in
|
|
|
ddfbe9 |
+++ b/doc/Makefile.in
|
|
|
ddfbe9 |
@@ -487,8 +487,8 @@ distclean-generic:
|
|
|
ddfbe9 |
maintainer-clean-generic:
|
|
|
ddfbe9 |
@echo "This command is intended for maintainers to use"
|
|
|
ddfbe9 |
@echo "it deletes files that may require special tools to rebuild."
|
|
|
ddfbe9 |
-@BUILD_DOCS_FALSE@uninstall-local:
|
|
|
ddfbe9 |
@BUILD_DOCS_FALSE@clean-local:
|
|
|
ddfbe9 |
+@BUILD_DOCS_FALSE@uninstall-local:
|
|
|
ddfbe9 |
@BUILD_DOCS_FALSE@install-data-hook:
|
|
|
ddfbe9 |
clean: clean-recursive
|
|
|
ddfbe9 |
|
|
|
ddfbe9 |
diff --git a/doc/SystemTap_Tapset_Reference/Makefile.am b/doc/SystemTap_Tapset_Reference/Makefile.am
|
|
|
ddfbe9 |
index 01cfb9a..23e2feb 100644
|
|
|
ddfbe9 |
--- a/doc/SystemTap_Tapset_Reference/Makefile.am
|
|
|
ddfbe9 |
+++ b/doc/SystemTap_Tapset_Reference/Makefile.am
|
|
|
ddfbe9 |
@@ -20,7 +20,7 @@ endif
|
|
|
ddfbe9 |
|
|
|
ddfbe9 |
if XMLTO_STRINGPARAM
|
|
|
ddfbe9 |
XMLTOMANPARAMS=--stringparam man.authors.section.enabled=0 --stringparam man.copyright.section.enabled=0
|
|
|
ddfbe9 |
-XMLTOHTMLPARAMS=--stringparam use.id.as.filename=1 --stringparam generate.toc='book\ toc,title'
|
|
|
ddfbe9 |
+XMLTOHTMLPARAMS=--stringparam use.id.as.filename=1 --stringparam generate.toc='book,toc,title'
|
|
|
ddfbe9 |
XMLTOPDFPARAMS=--stringparam refentry.generate.name=0 --stringparam refentry.generate.title=1
|
|
|
ddfbe9 |
endif
|
|
|
ddfbe9 |
|
|
|
ddfbe9 |
diff --git a/doc/SystemTap_Tapset_Reference/Makefile.in b/doc/SystemTap_Tapset_Reference/Makefile.in
|
|
|
ddfbe9 |
index c4ae06b..5faa98f 100644
|
|
|
ddfbe9 |
--- a/doc/SystemTap_Tapset_Reference/Makefile.in
|
|
|
ddfbe9 |
+++ b/doc/SystemTap_Tapset_Reference/Makefile.in
|
|
|
ddfbe9 |
@@ -335,7 +335,7 @@ HTML_INSTALL_DIR = $(DESTDIR)$(datadir)/doc/systemtap/tapsets
|
|
|
ddfbe9 |
# +--> man/ (mandocs) [by xmlto]
|
|
|
ddfbe9 |
@BUILD_PDFREFDOCS_TRUE@PDFDOCS = tapsets.pdf
|
|
|
ddfbe9 |
@XMLTO_STRINGPARAM_TRUE@XMLTOMANPARAMS = --stringparam man.authors.section.enabled=0 --stringparam man.copyright.section.enabled=0
|
|
|
ddfbe9 |
-@XMLTO_STRINGPARAM_TRUE@XMLTOHTMLPARAMS = --stringparam use.id.as.filename=1 --stringparam generate.toc='book\ toc,title'
|
|
|
ddfbe9 |
+@XMLTO_STRINGPARAM_TRUE@XMLTOHTMLPARAMS = --stringparam use.id.as.filename=1 --stringparam generate.toc='book,toc,title'
|
|
|
ddfbe9 |
@XMLTO_STRINGPARAM_TRUE@XMLTOPDFPARAMS = --stringparam refentry.generate.name=0 --stringparam refentry.generate.title=1
|
|
|
ddfbe9 |
@HAVE_FOP_FALSE@XMLTOPDF_FOP =
|
|
|
ddfbe9 |
@HAVE_FOP_TRUE@XMLTOPDF_FOP = --with-fop
|
|
|
ddfbe9 |
diff --git a/doc/beginners/Makefile.in b/doc/beginners/Makefile.in
|
|
|
ddfbe9 |
index 21381af..aa5df4f 100644
|
|
|
ddfbe9 |
--- a/doc/beginners/Makefile.in
|
|
|
ddfbe9 |
+++ b/doc/beginners/Makefile.in
|
|
|
ddfbe9 |
@@ -367,8 +367,8 @@ distclean-generic:
|
|
|
ddfbe9 |
maintainer-clean-generic:
|
|
|
ddfbe9 |
@echo "This command is intended for maintainers to use"
|
|
|
ddfbe9 |
@echo "it deletes files that may require special tools to rebuild."
|
|
|
ddfbe9 |
-@BUILD_PUBLICAN_FALSE@clean-local:
|
|
|
ddfbe9 |
@BUILD_PUBLICAN_FALSE@uninstall-local:
|
|
|
ddfbe9 |
+@BUILD_PUBLICAN_FALSE@clean-local:
|
|
|
ddfbe9 |
@BUILD_PUBLICAN_FALSE@install-data-hook:
|
|
|
ddfbe9 |
clean: clean-am
|
|
|
ddfbe9 |
|
|
|
ddfbe9 |
diff --git a/java/Makefile.in b/java/Makefile.in
|
|
|
ddfbe9 |
index 5c07690..df0d630 100644
|
|
|
ddfbe9 |
--- a/java/Makefile.in
|
|
|
ddfbe9 |
+++ b/java/Makefile.in
|
|
|
ddfbe9 |
@@ -626,8 +626,8 @@ maintainer-clean-generic:
|
|
|
ddfbe9 |
@echo "This command is intended for maintainers to use"
|
|
|
ddfbe9 |
@echo "it deletes files that may require special tools to rebuild."
|
|
|
ddfbe9 |
-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
|
|
|
ddfbe9 |
-@HAVE_JAVA_FALSE@uninstall-local:
|
|
|
ddfbe9 |
@HAVE_JAVA_FALSE@install-data-local:
|
|
|
ddfbe9 |
+@HAVE_JAVA_FALSE@uninstall-local:
|
|
|
ddfbe9 |
@HAVE_JAVA_FALSE@install-exec-local:
|
|
|
ddfbe9 |
clean: clean-am
|
|
|
ddfbe9 |
|