hal ChangeLog,1.543,1.544 configure.in,1.88,1.89

[Kay Sievers]

Update of /cvs/hal/hal
In directory gabe:/tmp/cvs-serv6834

Modified Files:
	ChangeLog configure.in 
Log Message:
2005-07-01  Kay Sievers  <kay.sievers at vrfy.org>

        * configure.in:
        * doc/api/Makefile.am:
        * doc/conf/Makefile.am:
        * doc/spec/Makefile.am:
        Allow to configure the documentation target directory.



Index: ChangeLog
===================================================================
RCS file: /cvs/hal/hal/ChangeLog,v
retrieving revision 1.543
retrieving revision 1.544
diff -u -d -r1.543 -r1.544
--- ChangeLog	1 Jul 2005 17:49:44 -0000	1.543
+++ ChangeLog	1 Jul 2005 18:16:46 -0000	1.544
@@ -1,5 +1,13 @@
 2005-07-01  Kay Sievers  <kay.sievers at vrfy.org>
 
+	* configure.in:
+	* doc/api/Makefile.am:
+	* doc/conf/Makefile.am:
+	* doc/spec/Makefile.am:
+	Allow to configure the documentation target directory.
+
+2005-07-01  Kay Sievers  <kay.sievers at vrfy.org>
+
 	* tools/device-manager/Device.py:
 	* tools/device-manager/DeviceManager.py:
 	* tools/device-manager/Representation.py:

Index: configure.in
===================================================================
RCS file: /cvs/hal/hal/configure.in,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -d -r1.88 -r1.89
--- configure.in	1 Jul 2005 15:50:31 -0000	1.88
+++ configure.in	1 Jul 2005 18:16:46 -0000	1.89
@@ -441,6 +441,17 @@
 fi
 
 
+# documentation target
+AC_ARG_WITH(doc-dir,   [  --with-doc-dir=[dirname] directory to install documentation])
+if ! test -z "$with_doc_dir"; then
+   DOCDIR=$with_doc_dir
+else
+   DOCDIR="$DATADIR/doc/hal-$VERSION"
+fi
+
+AC_SUBST(DOCDIR)
+
+
 ALL_LINGUAS="da fr de nb nl ru hu pt it zh_TW es"
 AC_SUBST(ALL_LINGUAS)
 
@@ -510,6 +521,7 @@
         datadir:                  ${DATADIR}
         sysconfdir:               ${SYSCONFDIR}
         localstatedir:            ${LOCALSTATEDIR}
+        docdir:                   ${DOCDIR}
         dbus-1 system.d dir:      ${DBUS_SYS_DIR}
         pci.ids, usb.ids dir:     ${HWDATA_DIR}
         linux hotplug.d dir:      ${LINUX_HOTPLUG_DIR}