Add -with-html-dir option. (bug #102497)

2003-01-06  Padraig O'Briain  <padraig.obriain@sun.com>

	* configure.in: Add -with-html-dir option. (bug #102497)

	* docs/Makefile.am: Remove INSTALLDIR and HTML_DIR

	* docs/tmpl/atkobject.sgml: Update so property names are in
	alphabetic order.

diff --git a/ChangeLog b/ChangeLog
index c13fd5b..f89135f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2003-01-06  Padraig O'Briain  <padraig.obriain@sun.com>
+
+       * configure.in: Add -with-html-dir option. (bug #102497)
+
+       * docs/Makefile.am: Remove INSTALLDIR and HTML_DIR
+
+       * docs/tmpl/atkobject.sgml: Update so property names are in
+       alphabetic order.
+
 2003-01-03  Padraig O'Briain  <padraig.obriain@sun.com>
 
        * ===== Released 1.2.1=====

diff --git a/configure.in b/configure.in
index ea82b7c..8aebc0d 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -138,6 +138,16 @@ PKG_CHECK_MODULES(DEP, glib-2.0 >= $GLIB_REQUIRED_VERSION $GLIB_PACKAGES, , AC_M
 # Rerun PKG_CONFIG to add gthread-2.0 cflags, but not libs
 DEP_CFLAGS=`$PKG_CONFIG --cflags $GLIB_PACKAGES gthread-2.0`
 
+AC_ARG_WITH(html-dir, [         --with-html-dir=PATH    path to installed docs ])
+
+if test "x$with_html_dir" = "x" ; then
+  HTML_DIR='${datadir}/gtk-doc/html'
+else
+  HTML_DIR=$with_html_dir
+fi
+
+AC_SUBST(HTML_DIR)
+
 gtk_doc_min_version=0.9
 AC_CHECK_PROG(GTKDOC, gtkdoc-mkdb, true, false)
 

diff --git a/docs/Makefile.am b/docs/Makefile.am
index 7576e37..3310ced 100644 (file)
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -11,10 +11,6 @@ DOC_MAIN_SGML_FILE=atk-docs.sgml
 # The directory containing the source code (if it contains documentation).
 DOC_SOURCE_DIR=../atk
 
-INSTALLDIR=$(prefix)/share/gtk-doc
-
-HTML_DIR = ${datadir}/gtk-doc/html
-
 # Header files to ignore when scanning
 IGNORE_HFILES =        atkmarshal.h atkintl.h
 

diff --git a/docs/tmpl/atkobject.sgml b/docs/tmpl/atkobject.sgml
index 7fe8572..223fea7 100644 (file)
--- a/docs/tmpl/atkobject.sgml
+++ b/docs/tmpl/atkobject.sgml
@@ -474,37 +474,32 @@ This signal support, which may be any of the accessible state types.
 
 @atkobject: the object which received the signal.
 
-<!-- ##### ARG AtkObject:accessible-name ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG AtkObject:accessible-description ##### -->
+<!-- ##### ARG AtkObject:accessible-component-layer ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG AtkObject:accessible-parent ##### -->
+<!-- ##### ARG AtkObject:accessible-component-mdi-zorder ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG AtkObject:accessible-value ##### -->
+<!-- ##### ARG AtkObject:accessible-description ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG AtkObject:accessible-role ##### -->
+<!-- ##### ARG AtkObject:accessible-name ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG AtkObject:accessible-component-layer ##### -->
+<!-- ##### ARG AtkObject:accessible-parent ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG AtkObject:accessible-component-mdi-zorder ##### -->
+<!-- ##### ARG AtkObject:accessible-role ##### -->
 <para>
 
 </para>
@@ -539,3 +534,8 @@ This signal support, which may be any of the accessible state types.
 
 </para>
 
+<!-- ##### ARG AtkObject:accessible-value ##### -->
+<para>
+
+</para>
+