Toward 1.0.0, added docs to the packages, Daniel.
diff --git a/ChangeLog b/ChangeLog
index b679c87..2a2f843 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Feb 25 11:52:24 CET 1999 Daniel Veillard <Daniel.Veillard@w3.org>
+
+ * configure.in, Makefile.am, doc/makefile.am : General changes for
+ 1.0.0 release and including the generated HTML documentation.
+
Thu Feb 25 09:44:52 CET 1999 Daniel Veillard <Daniel.Veillard@w3.org>
* makefile.am : added parserInternals.h, oops.
diff --git a/Makefile.am b/Makefile.am
index 4d9f75e..cf87f47 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -58,8 +58,7 @@
confexecdir=$(libdir)
confexec_DATA = xmlConf.sh
-EXTRA_DIST = xmlConf.sh.in libxml.spec.in doc/xml.html doc/structure.gif \
- doc/DOM.gif
+EXTRA_DIST = xmlConf.sh.in libxml.spec.in
dist-hook:
cp libxml.spec $(distdir)
diff --git a/configure.in b/configure.in
index 30a7d8e..f76d329 100644
--- a/configure.in
+++ b/configure.in
@@ -2,7 +2,7 @@
AC_PREREQ(2.2)
AC_INIT(entities.h)
AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(libxml, 0.99.8)
+AM_INIT_AUTOMAKE(libxml, 1.0.0)
AC_ARG_WITH(html-dir, [ --with-html-dir=PATH path to installed docs ])
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 0d13433..e918a49 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -9,9 +9,13 @@
# The directory containing the source code (if it contains documentation).
DOC_SOURCE_DIR=..
+HTML_DIR=$(datadir)/gnome-xml/html
TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)
+# htmldir = $(prefix)/html
+# html_DATA = gnome-dev-info.html
+
scan:
gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="acconfig.h config.h"
@@ -31,8 +35,8 @@
maintainer-clean-local: clean
rm -rf sgml html $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
-docdatadir = $(datadir)/aclocal
-docdata_DATA = xml.html structure.gif DOM.gif
+# docdatadir = $(datadir)/aclocal
+# docdata_DATA = xml.html structure.gif DOM.gif
gnome-xml-decl-list.txt : templates
@@ -41,11 +45,14 @@
rebuild: gnome-xml-sections.txt templates sgml html
-#install-data-local:
-# install -d -m 0755 $(TARGET_DIR)
-# install -m 0644 xml.html structure.gif DOM.gif $(TARGET_DIR)
-# install -m 0644 html/*.html $(TARGET_DIR)
-# install -m 0644 html/index.sgml $(TARGET_DIR)
-# gtkdoc-fixxref --module=$(DOC_MODULE) --html-dir=$(HTML_DIR)
+install-data-local:
+ install -d -m 0755 $(TARGET_DIR)
+ -install -m 0644 $(srcdir)/xml.html $(srcdir)/structure.gif $(srcdir)/DOM.gif $(TARGET_DIR)
+ -install -m 0644 $(srcdir)/html/*.html $(TARGET_DIR)
+ -install -m 0644 $(srcdir)/html/index.sgml $(TARGET_DIR)
+ -gtkdoc-fixxref --module=$(DOC_MODULE) --html-dir=$(HTML_DIR)
+
+dist-hook:
+ (cd $(srcdir) ; tar cvf - xml.html structure.gif DOM.gif html/*.html html/*.sgml) | (cd $(distdir); tar xf -)
.PHONY : html sgml templates scan