paalied patch from Julio M. Merino Vidal fixing bug #134751 to fix
* configure.in doc/Makefile.am include/libxml/Makefile.am:
paalied patch from Julio M. Merino Vidal fixing bug #134751
to fix --with-html-dir option.
* doc/*: rebuilt fully the docs
* doc/html/libxml-xmlsave.html: new file from new header.
Daniel
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 09a6115..e2d2fa6 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to produce Makefile.in
SUBDIRS=examples
-# The name of the module.
-DOC_MODULE=libxml2-$(VERSION)
# The top-level SGML file.
DOC_MAIN_XML_FILE=gnome-xml.xml
@@ -9,12 +7,9 @@
# The directory containing the source code (if it contains documentation).
DOC_SOURCE_DIR=..
-HTML_DIR=$(datadir)/doc
-
# A file in win32 depends upon one of the doc files
WIN32_DIR=$(top_srcdir)/win32
-TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)/html
PAGES= architecture.html bugs.html contribs.html docs.html DOM.html \
downloads.html entities.html example.html help.html index.html \
interface.html intro.html library.html namespaces.html news.html \
@@ -94,20 +89,20 @@
rebuild: api all
install-data-local:
- $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR)
- -@INSTALL@ -m 0644 $(srcdir)/xml.html $(srcdir)/encoding.html $(srcdir)/FAQ.html $(srcdir)/structure.gif $(srcdir)/DOM.gif $(srcdir)/smallfootonly.gif $(srcdir)/redhat.gif $(srcdir)/libxml.gif $(srcdir)/w3c.png $(srcdir)/Libxml2-Logo-180x168.gif $(srcdir)/Libxml2-Logo-90x34.gif $(DESTDIR)$(TARGET_DIR)
- $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR)/html
- -@INSTALL@ -m 0644 $(srcdir)/html/*.html $(DESTDIR)$(TARGET_DIR)/html
- -@INSTALL@ -m 0644 $(srcdir)/html/*.png $(DESTDIR)$(TARGET_DIR)/html
- -@INSTALL@ -m 0644 $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR)/html
- $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR)/tutorial
+ $(mkinstalldirs) $(DESTDIR)$(HTML_DIR)
+ -@INSTALL@ -m 0644 $(srcdir)/xml.html $(srcdir)/encoding.html $(srcdir)/FAQ.html $(srcdir)/structure.gif $(srcdir)/DOM.gif $(srcdir)/smallfootonly.gif $(srcdir)/redhat.gif $(srcdir)/libxml.gif $(srcdir)/w3c.png $(srcdir)/Libxml2-Logo-180x168.gif $(srcdir)/Libxml2-Logo-90x34.gif $(DESTDIR)$(HTML_DIR)
+ $(mkinstalldirs) $(DESTDIR)$(HTML_DIR)/html
+ -@INSTALL@ -m 0644 $(srcdir)/html/*.html $(DESTDIR)$(HTML_DIR)/html
+ -@INSTALL@ -m 0644 $(srcdir)/html/*.png $(DESTDIR)$(HTML_DIR)/html
+ -@INSTALL@ -m 0644 $(srcdir)/html/index.sgml $(DESTDIR)$(HTML_DIR)/html
+ $(mkinstalldirs) $(DESTDIR)$(HTML_DIR)/tutorial
-@INSTALL@ -m 0644 $(srcdir)/tutorial/*.* \
- $(DESTDIR)$(TARGET_DIR)/tutorial
- $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR)/tutorial/images
+ $(DESTDIR)$(HTML_DIR)/tutorial
+ $(mkinstalldirs) $(DESTDIR)$(HTML_DIR)/tutorial/images
-@INSTALL@ -m 0644 $(srcdir)/tutorial/images/*.* \
- $(DESTDIR)$(TARGET_DIR)/tutorial/images
- $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR)/tutorial/images/callouts
+ $(DESTDIR)$(HTML_DIR)/tutorial/images
+ $(mkinstalldirs) $(DESTDIR)$(HTML_DIR)/tutorial/images/callouts
-@INSTALL@ -m 0644 $(srcdir)/tutorial/images/callouts/*.* \
- $(DESTDIR)$(TARGET_DIR)/tutorial/images/callouts
+ $(DESTDIR)$(HTML_DIR)/tutorial/images/callouts
.PHONY : html xml templates scan