Revert the "move of documentation out of share/doc/html". In fact, it

_wasn't_ there (i.e., me not looking correctly).  The documentation was
in share/doc/icewm/html, which is perfectly acceptable (a package can
organize documentation however it wants inside its doc directory).
No revision bump since it was bumped just some minutes ago.

2 files changed, 26 insertions, 24 deletions

diff --git a/wm/icewm/Makefile.common b/wm/icewm/Makefile.common
index 0e5227be09e..6ff146846dc 100644
--- a/wm/icewm/Makefile.common
+++ b/wm/icewm/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.34 2004/07/02 19:00:12 jmmv Exp $
+# $NetBSD: Makefile.common,v 1.35 2004/07/02 19:25:16 jmmv Exp $
 
 DISTNAME=		icewm-1.2.14
 CATEGORIES=		x11 wm
@@ -48,17 +48,18 @@ CONFIGURE_ARGS+=	--with-unicode-set=utf-32
 .endif
 
 DOCDIR=			${PREFIX}/share/doc/icewm
+HTMLDIR=		${PREFIX}/share/doc/icewm/html
 INSTALL_TARGET=		install-base install-nls
 
 post-extract:
 	@${CP} ${FILESDIR}/bsd-daemon.xpm ${WRKSRC}/lib/taskbar
 
 post-install:
-	${INSTALL_DATA_DIR} ${DOCDIR}
+	${INSTALL_DATA_DIR} ${DOCDIR} ${HTMLDIR}
 	for file in BUGS CHANGES COPYING README README.wm-session TODO; do\
 		${INSTALL_DATA} ${WRKSRC}/$${file} ${DOCDIR}; \
 	done
-	${INSTALL_DATA} ${WRKSRC}/doc/*.html ${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/*.html ${HTMLDIR}
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../fonts/Xft2/buildlink3.mk"
diff --git a/wm/icewm/PLIST b/wm/icewm/PLIST
index 52b89b780da..5604bbf9a94 100644
--- a/wm/icewm/PLIST
+++ b/wm/icewm/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2004/07/02 19:00:12 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.14 2004/07/02 19:25:16 jmmv Exp $
 bin/icehelp
 bin/icesh
 bin/icewm
@@ -12,26 +12,26 @@ share/doc/icewm/COPYING
 share/doc/icewm/README
 share/doc/icewm/README.wm-session
 share/doc/icewm/TODO
-share/doc/icewm/icewm-1.html
-share/doc/icewm/icewm-10.html
-share/doc/icewm/icewm-11.html
-share/doc/icewm/icewm-12.html
-share/doc/icewm/icewm-13.html
-share/doc/icewm/icewm-14.html
-share/doc/icewm/icewm-15.html
-share/doc/icewm/icewm-16.html
-share/doc/icewm/icewm-17.html
-share/doc/icewm/icewm-18.html
-share/doc/icewm/icewm-19.html
-share/doc/icewm/icewm-2.html
-share/doc/icewm/icewm-3.html
-share/doc/icewm/icewm-4.html
-share/doc/icewm/icewm-5.html
-share/doc/icewm/icewm-6.html
-share/doc/icewm/icewm-7.html
-share/doc/icewm/icewm-8.html
-share/doc/icewm/icewm-9.html
-share/doc/icewm/icewm.html
+share/doc/icewm/html/icewm-1.html
+share/doc/icewm/html/icewm-10.html
+share/doc/icewm/html/icewm-11.html
+share/doc/icewm/html/icewm-12.html
+share/doc/icewm/html/icewm-13.html
+share/doc/icewm/html/icewm-14.html
+share/doc/icewm/html/icewm-15.html
+share/doc/icewm/html/icewm-16.html
+share/doc/icewm/html/icewm-17.html
+share/doc/icewm/html/icewm-18.html
+share/doc/icewm/html/icewm-19.html
+share/doc/icewm/html/icewm-2.html
+share/doc/icewm/html/icewm-3.html
+share/doc/icewm/html/icewm-4.html
+share/doc/icewm/html/icewm-5.html
+share/doc/icewm/html/icewm-6.html
+share/doc/icewm/html/icewm-7.html
+share/doc/icewm/html/icewm-8.html
+share/doc/icewm/html/icewm-9.html
+share/doc/icewm/html/icewm.html
 share/icewm/icons/app_16x16.xpm
 share/icewm/icons/app_32x32.xpm
 share/icewm/icons/bomb_16x16.xpm
@@ -378,4 +378,5 @@ ${PKGLOCALEDIR}/locale/zh_TW.Big5/LC_MESSAGES/icewm.mo
 @dirrm share/icewm/ledclock
 @dirrm share/icewm/icons
 @dirrm share/icewm
+@dirrm share/doc/icewm/html
 @dirrm share/doc/icewm