make doc-dir configurable

[Kay Sievers]

This makes the place where the documentation gets installed
configurable.

Ok to commit?

Thanks,
Kay
-------------- next part --------------
Index: configure.in
===================================================================
RCS file: /cvs/hal/hal/configure.in,v
retrieving revision 1.88
diff -u -r1.88 configure.in
--- configure.in	1 Jul 2005 15:50:31 -0000	1.88
+++ configure.in	1 Jul 2005 17:42:42 -0000
@@ -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}
Index: doc/api/Makefile.am
===================================================================
RCS file: /cvs/hal/hal/doc/api/Makefile.am,v
retrieving revision 1.2
diff -u -r1.2 Makefile.am
--- doc/api/Makefile.am	23 Sep 2004 18:13:45 -0000	1.2
+++ doc/api/Makefile.am	1 Jul 2005 17:42:42 -0000
@@ -3,7 +3,7 @@
 
 EXTRA_DIST = Doxyfile Doxyfile.in
 
-htmldocdir = $(datadir)/doc/hal-$(VERSION)/api
+htmldocdir = $(DOCDIR)/api
 htmldoc_DATA = html/*
 
 html/* : Doxyfile
Index: doc/conf/Makefile.am
===================================================================
RCS file: /cvs/hal/hal/doc/conf/Makefile.am,v
retrieving revision 1.2
diff -u -r1.2 Makefile.am
--- doc/conf/Makefile.am	14 Oct 2004 18:37:28 -0000	1.2
+++ doc/conf/Makefile.am	1 Jul 2005 17:42:42 -0000
@@ -1,5 +1,5 @@
 
 EXTRA_DIST = storage-policy-examples.fdi storage-skip-all.fdi storage-non-fixed.fdi
 
-confdir = $(datadir)/doc/hal-$(VERSION)/conf
+confdir = $(DOCDIR)/conf
 conf_DATA = storage-policy-examples.fdi storage-skip-all.fdi storage-non-fixed.fdi
Index: doc/spec/Makefile.am
===================================================================
RCS file: /cvs/hal/hal/doc/spec/Makefile.am,v
retrieving revision 1.7
diff -u -r1.7 Makefile.am
--- doc/spec/Makefile.am	1 Nov 2004 23:19:04 -0000	1.7
+++ doc/spec/Makefile.am	1 Jul 2005 17:42:42 -0000
@@ -10,7 +10,7 @@
 
 if DOCBOOK_DOCS_ENABLED
 
-htmldocdir = $(datadir)/doc/hal-$(VERSION)/spec
+htmldocdir = $(DOCDIR)/spec
 htmldoc_DATA = hal-spec.html $(FIGURE_FILES)
 
 hal-spec.html : hal-spec.xml $(FIGURE_FILES)
-------------- next part --------------
_______________________________________________
hal mailing list
hal at lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/hal