[seed] Bug 629216 - seed doesn't use docdir for documentation

[Alan Knowles <alank src gnome org>]

commit 6361f9fc6c6a7eed53399e0eda72402517ec9496
Author: Chris Mayo <aklhfex gmail com>
Date:   Fri Sep 10 07:30:04 2010 +0800

    Bug 629216 - seed doesn't use docdir for documentation
    
    Use docdir rather than hardcoded datadir subdirectory

 Makefile.am                             |    6 ++----
 config.h.in                             |    3 +++
 doc/Makefile.am                         |    1 -
 doc/mapping/Makefile.am                 |    2 +-
 doc/modules/Makefile.am                 |    7 ++-----
 doc/modules/canvas/Makefile.am          |    2 +-
 doc/modules/gtkbuilder/Makefile.am      |    4 +---
 doc/modules/multiprocessing/Makefile.am |    2 +-
 doc/modules/readline/Makefile.am        |    2 +-
 doc/modules/sandbox/Makefile.am         |    4 +---
 doc/modules/sqlite/Makefile.am          |    2 +-
 doc/tutorial-standalone/Makefile.am     |    2 +-
 12 files changed, 15 insertions(+), 22 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 5bfb716..3af2962 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,8 +10,7 @@ SUBDIRS = po \
 	tests \
 	doc
 
-seeddocdir = ${prefix}/share/doc/seed
-seeddoc_DATA = \
+doc_DATA = \
 	README \
 	COPYING \
 	AUTHORS \
@@ -23,8 +22,7 @@ pkgconfigdir = $(libdir)/pkgconfig
 
 man_MANS = doc/seed.1
 
-EXTRA_DIST = $(seeddoc_DATA) \
-	$(pkgconfig_DATA)
+EXTRA_DIST = $(pkgconfig_DATA)
 
 DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc
 
diff --git a/config.h.in b/config.h.in
index 7845c40..035e732 100644
--- a/config.h.in
+++ b/config.h.in
@@ -24,6 +24,9 @@
 /* Define if your <locale.h> file defines LC_MESSAGES. */
 #undef HAVE_LC_MESSAGES
 
+/* Define to 1 if you have the `webkit-1.0' library (-lwebkit-1.0). */
+#undef HAVE_LIBWEBKIT_1_0
+
 /* Define to 1 if you have the <locale.h> header file. */
 #undef HAVE_LOCALE_H
 
diff --git a/doc/Makefile.am b/doc/Makefile.am
index f2614a5..215ba1d 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -10,7 +10,6 @@ EXTRA_DIST = \
 	sh_js.js \
 	seed.1
 
-docdir = $(datadir)/doc/seed/
 doc_DATA = index.html runtime.html conventions.html style.css sh.css sh.js sh_js.js
 
 ## File created by the gnome-build tools
diff --git a/doc/mapping/Makefile.am b/doc/mapping/Makefile.am
index 200e463..cf89a22 100644
--- a/doc/mapping/Makefile.am
+++ b/doc/mapping/Makefile.am
@@ -1,5 +1,5 @@
 
-tutorialdir=$(datadir)/doc/seed/mapping
+tutorialdir=$(docdir)/mapping
 tutorial_DATA = \
 	mapping.html \
 	enum-mapping.png
diff --git a/doc/modules/Makefile.am b/doc/modules/Makefile.am
index c2d9bab..1f3ee15 100644
--- a/doc/modules/Makefile.am
+++ b/doc/modules/Makefile.am
@@ -7,14 +7,11 @@ html/index.html: version.xml book.xml sqlite/sqlite.xml sqlite/sqlite-funcs.xml
 	gtkdoc-mkhtml "Seed" book.xml;
 	mv *.html *.css *.png *.sgml *.devhelp* html
 
-bookdir = $(datadir)/doc/seed/modules/html
+bookdir = $(docdir)/modules/html
 book_DATA = html/index.html
 
 install-data-local:
-	cp -r html $(DESTDIR)$(datadir)/doc/seed/modules
+	cp -r html $(DESTDIR)$(docdir)/modules
 
 CLEANFILES = html/*
 endif 
-
-
-
diff --git a/doc/modules/canvas/Makefile.am b/doc/modules/canvas/Makefile.am
index 8a85d16..79042e4 100644
--- a/doc/modules/canvas/Makefile.am
+++ b/doc/modules/canvas/Makefile.am
@@ -1,4 +1,4 @@
-modulesdir = $(datadir)/doc/seed/modules
+modulesdir = $(docdir)/modules
 modules_DATA = \
 	canvas.html
 EXTRA_DIST = \
diff --git a/doc/modules/gtkbuilder/Makefile.am b/doc/modules/gtkbuilder/Makefile.am
index 1532b5c..9a98911 100644
--- a/doc/modules/gtkbuilder/Makefile.am
+++ b/doc/modules/gtkbuilder/Makefile.am
@@ -9,7 +9,5 @@ gtkbuilder-funcs.xml: $(top_builddir)/src/seed $(top_srcdir)/doc/modules/gtkbuil
 CLEANFILES=gtkbuilder-funcs.xml
 
 gtkbuilderdocsdir = \
-	$(datadir)/doc/seed/modules/gtkbuilder/html
+	$(docdir)/modules/gtkbuilder/html
 gtkbuilderdocs_DATA = gtkbuilder-funcs.xml
-
-
diff --git a/doc/modules/multiprocessing/Makefile.am b/doc/modules/multiprocessing/Makefile.am
index 14bba7c..612f9fe 100644
--- a/doc/modules/multiprocessing/Makefile.am
+++ b/doc/modules/multiprocessing/Makefile.am
@@ -1,4 +1,4 @@
-modulesdir = $(datadir)/doc/seed/modules
+modulesdir = $(docdir)/modules
 modules_DATA = \
 	multiprocessing.html
 EXTRA_DIST = \
diff --git a/doc/modules/readline/Makefile.am b/doc/modules/readline/Makefile.am
index 30109fc..fa54ab6 100644
--- a/doc/modules/readline/Makefile.am
+++ b/doc/modules/readline/Makefile.am
@@ -6,7 +6,7 @@ readline-funcs.xml: $(top_builddir)/src/seed $(top_srcdir)/doc/modules/readline/
 CLEANFILES=readline-funcs.xml
 
 readlinedocsdir = \
-	$(datadir)/doc/seed/modules/readline/html
+	$(docdir)/modules/readline/html
 readlinedocs_DATA = readline-funcs.xml
 
 #index.html: readline-funcs.xml
diff --git a/doc/modules/sandbox/Makefile.am b/doc/modules/sandbox/Makefile.am
index 46b1128..a4772a0 100644
--- a/doc/modules/sandbox/Makefile.am
+++ b/doc/modules/sandbox/Makefile.am
@@ -6,7 +6,5 @@ sandbox-funcs.xml: $(top_builddir)/src/seed $(top_srcdir)/doc/modules/sandbox/sa
 CLEANFILES=sandbox-funcs.xml
 
 sandboxdocsdir = \
-	$(datadir)/doc/seed/modules/sandbox/html
+	$(docdir)/modules/sandbox/html
 sandboxdocs_DATA = sandbox-funcs.xml
-
-
diff --git a/doc/modules/sqlite/Makefile.am b/doc/modules/sqlite/Makefile.am
index 8c948e1..b738154 100644
--- a/doc/modules/sqlite/Makefile.am
+++ b/doc/modules/sqlite/Makefile.am
@@ -6,7 +6,7 @@ sqlite-funcs.xml: $(top_builddir)/src/seed $(top_srcdir)/doc/modules/sqlite/sqli
 CLEANFILES=sqlite-funcs.xml
 
 sqlitedocsdir = \
-	$(datadir)/doc/seed/modules/sqlite/html
+	$(docdir)/modules/sqlite/html
 sqlitedocs_DATA = sqlite-funcs.xml
 
 #index.html: sqlite-funcs.xml
diff --git a/doc/tutorial-standalone/Makefile.am b/doc/tutorial-standalone/Makefile.am
index 4998629..59ff2d8 100644
--- a/doc/tutorial-standalone/Makefile.am
+++ b/doc/tutorial-standalone/Makefile.am
@@ -1,5 +1,5 @@
 
-tutorialdir=$(datadir)/doc/seed/tutorial
+tutorialdir=$(docdir)/tutorial
 tutorial_DATA = \
 	1.js \
 	2.js \