Simplify installation target and fix DESTDIR case.

Patch supplied by joerg@ in email

1 files changed, 6 insertions, 7 deletions

diff --git a/mail/exmh/Makefile b/mail/exmh/Makefile
index 8c098590136..ff5f4d13704 100644
--- a/mail/exmh/Makefile
+++ b/mail/exmh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2008/03/04 17:57:18 jlam Exp $
+# $NetBSD: Makefile,v 1.48 2008/04/13 03:49:01 dsainty Exp $
 
 DISTNAME=	exmh-2.7.2
 CATEGORIES=	mail tk
@@ -20,6 +20,8 @@ USE_TOOLS+=	wish:run
 
 DIST_SUBDIR=	${PKGNAME_NOREV}
 
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 lib/${PKGNAME_NOREV}/html
+
 # Additionally, exmh will use the following packages if present:
 # lang/expect
 # textproc/glimpse
@@ -39,9 +41,6 @@ do-install:
 	for binfile in exmh-async exmh-bg exmh-strip exmh ftp.expect; do \
 		${INSTALL_SCRIPT} ${WRKSRC}/$$binfile ${DESTDIR}${PREFIX}/bin; \
 	done
-	vers=`sed -ne 's/^set vers \(.*\)/\1/p' ${WRKSRC}/exmh.install`; \
-	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/lib/exmh-$${vers}; \
-	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/lib/exmh-$${vers}/html; \
 	for libfile in \
 			${WRKSRC}/lib/PgpDecryptExpect \
 			${WRKSRC}/lib/*.tcl ${WRKSRC}/lib/*.bitmap \
@@ -51,11 +50,11 @@ do-install:
 			${WRKSRC}/lib/*.exp ${WRKSRC}/lib/mime.types \
 			${WRKSRC}/lib/*.au ${WRKSRC}/lib/*.gif; do \
 		${INSTALL_DATA} $$libfile \
-			${DESTDIR}${PREFIX}/lib/exmh-$${vers}; \
-	done; \
+			${DESTDIR}${PREFIX}/lib/${PKGNAME_NOREV}; \
+	done
 	for hfile in ${WRKSRC}/lib/html/*; do \
 		${INSTALL_DATA} $$hfile \
-			${DESTDIR}${PREFIX}/lib/exmh-$${vers}/html; \
+			${DESTDIR}${PREFIX}/lib/${PKGNAME_NOREV}/html; \
 	done
 
 .include "../../x11/tk/buildlink3.mk"