Move documentation from share/doc/html to share/doc.

2 files changed, 40 insertions, 40 deletions

diff --git a/devel/GConf2/Makefile.common b/devel/GConf2/Makefile.common
index 70d8a4a028e..a3f0bde70d3 100644
--- a/devel/GConf2/Makefile.common
+++ b/devel/GConf2/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.21 2004/06/28 12:52:45 jmmv Exp $
+# $NetBSD: Makefile.common,v 1.22 2004/06/28 13:02:21 jmmv Exp $
 #
 
 DISTNAME=		GConf-2.6.2
@@ -31,7 +31,7 @@ PKGCONFIG_OVERRIDE=	gconf-2.0.pc.in
 PKG_SYSCONFSUBDIR=	gconf
 
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
-CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc/html
+CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc
 CONFIGURE_ARGS+=	--disable-gtk-doc
 CONFIGURE_ARGS+=	--enable-gconf-source=xml::${PKG_SYSCONFDIR}/gconf.xml.defaults
 
diff --git a/devel/GConf2/PLIST b/devel/GConf2/PLIST
index 9a9fb42172e..aa6a9254eff 100644
--- a/devel/GConf2/PLIST
+++ b/devel/GConf2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2004/06/28 12:52:45 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.18 2004/06/28 13:02:21 jmmv Exp $
 bin/gconf-merge-tree
 bin/gconftool-2
 include/gconf/2/gconf/gconf-changeset.h
@@ -25,42 +25,42 @@ lib/pkgconfig/gconf-2.0.pc
 libexec/gconfd-2
 man/man1/gconftool-2.1
 share/aclocal/gconf-2.m4
-share/doc/html/gconf/ch01.html
-share/doc/html/gconf/ch01s02.html
-share/doc/html/gconf/ch02.html
-share/doc/html/gconf/ch02s02.html
-share/doc/html/gconf/ch02s03.html
-share/doc/html/gconf/ch02s04.html
-share/doc/html/gconf/ch06.html
-share/doc/html/gconf/ch06s02.html
-share/doc/html/gconf/ch06s03.html
-share/doc/html/gconf/ch07.html
-share/doc/html/gconf/conventions.html
-share/doc/html/gconf/gconf-GConfClient.html
-share/doc/html/gconf/gconf-client-reference.html
-share/doc/html/gconf/gconf-client.html
-share/doc/html/gconf/gconf-gconf-backend.html
-share/doc/html/gconf/gconf-gconf-changeset.html
-share/doc/html/gconf/gconf-gconf-engine.html
-share/doc/html/gconf/gconf-gconf-error.html
-share/doc/html/gconf/gconf-gconf-internals.html
-share/doc/html/gconf/gconf-gconf-listeners.html
-share/doc/html/gconf/gconf-gconf-locale.html
-share/doc/html/gconf/gconf-gconf-schema.html
-share/doc/html/gconf/gconf-gconf-sources.html
-share/doc/html/gconf/gconf-gconf-value.html
-share/doc/html/gconf/gconf-gconf.html
-share/doc/html/gconf/gconf-internals-reference.html
-share/doc/html/gconf/gconf-reference.html
-share/doc/html/gconf/gconf.devhelp
-share/doc/html/gconf/gconftool.html
-share/doc/html/gconf/home.png
-share/doc/html/gconf/index.html
-share/doc/html/gconf/index.sgml
-share/doc/html/gconf/left.png
-share/doc/html/gconf/right.png
-share/doc/html/gconf/style.css
-share/doc/html/gconf/up.png
+share/doc/gconf/ch01.html
+share/doc/gconf/ch01s02.html
+share/doc/gconf/ch02.html
+share/doc/gconf/ch02s02.html
+share/doc/gconf/ch02s03.html
+share/doc/gconf/ch02s04.html
+share/doc/gconf/ch06.html
+share/doc/gconf/ch06s02.html
+share/doc/gconf/ch06s03.html
+share/doc/gconf/ch07.html
+share/doc/gconf/conventions.html
+share/doc/gconf/gconf-GConfClient.html
+share/doc/gconf/gconf-client-reference.html
+share/doc/gconf/gconf-client.html
+share/doc/gconf/gconf-gconf-backend.html
+share/doc/gconf/gconf-gconf-changeset.html
+share/doc/gconf/gconf-gconf-engine.html
+share/doc/gconf/gconf-gconf-error.html
+share/doc/gconf/gconf-gconf-internals.html
+share/doc/gconf/gconf-gconf-listeners.html
+share/doc/gconf/gconf-gconf-locale.html
+share/doc/gconf/gconf-gconf-schema.html
+share/doc/gconf/gconf-gconf-sources.html
+share/doc/gconf/gconf-gconf-value.html
+share/doc/gconf/gconf-gconf.html
+share/doc/gconf/gconf-internals-reference.html
+share/doc/gconf/gconf-reference.html
+share/doc/gconf/gconf.devhelp
+share/doc/gconf/gconftool.html
+share/doc/gconf/home.png
+share/doc/gconf/index.html
+share/doc/gconf/index.sgml
+share/doc/gconf/left.png
+share/doc/gconf/right.png
+share/doc/gconf/style.css
+share/doc/gconf/up.png
 share/examples/GConf2/path
 ${PKGLOCALEDIR}/locale/am/LC_MESSAGES/GConf2.mo
 ${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/GConf2.mo
@@ -126,7 +126,7 @@ share/sgml/gconf/gconf-1.0.dtd
 @dirrm share/gconf/schemas
 @unexec ${RMDIR} -p %D/share/gconf 2>/dev/null || ${TRUE}
 @dirrm share/examples/GConf2
-@dirrm share/doc/html/gconf
+@dirrm share/doc/gconf
 @dirrm lib/GConf/2
 @unexec ${RMDIR} -p %D/lib/GConf 2>/dev/null || ${TRUE}
 @dirrm include/gconf/2/gconf