Use mk/emacs.mk.

2 files changed, 26 insertions, 30 deletions

diff --git a/devel/haskell-mode/Makefile b/devel/haskell-mode/Makefile
index d28bf1d42be..94636240b51 100644
--- a/devel/haskell-mode/Makefile
+++ b/devel/haskell-mode/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2002/09/07 11:07:55 kristerw Exp $
+# $NetBSD: Makefile,v 1.9 2002/09/14 03:20:28 uebayasi Exp $
 
 DISTNAME=		haskell-mode-1.43
 CATEGORIES=		devel editors
@@ -12,18 +12,14 @@ WRKSRC=			${WRKDIR}
 
 .include "../../mk/bsd.prefs.mk"
 
-.if defined(USE_XEMACS)
-DEPENDS+=	 	xemacs-[0-9]*:../../editors/xemacs
-EMACS=			xemacs
-LISPDIR=		lib/xemacs/xemacs-packages/lisp/prog-modes
+.include "../../mk/emacs.mk"
+
+.if ${EMACS_FLAVOR} == "emacs"
+EMACS=	"emacs"
 .else
-DEPENDS+=	 	emacs-[0-9]*:../../editors/emacs
-EMACS=			emacs
-LISPDIR=		share/emacs/site-lisp/haskell-mode
+EMACS=	"xemacs"
 .endif
 
-PLIST_SUBST+=		LISPDIR=${LISPDIR}
-
 HTML=	.emacs fontlock.hs indent.hs index.html installation-guide.html
 SRCS=	haskell-decl-scan.el haskell-doc.el haskell-font-lock.el	\
 	haskell-ghci.el haskell-hugs.el haskell-indent.el		\
@@ -36,9 +32,9 @@ do-build:
 	done
 
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/${LISPDIR}
+	${INSTALL_DATA_DIR} ${EMACS_LISPPREFIX}/haskell-mode
 	cd ${WRKSRC} && ${INSTALL_DATA} ${SRCS} ${SRCS:.el=.elc} 	\
-			${PREFIX}/${LISPDIR}
+			${EMACS_LISPPREFIX}/haskell-mode
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/haskell-mode
 	cd ${WRKSRC} && ${INSTALL_DATA} ${HTML}				\
 			${PREFIX}/share/doc/html/haskell-mode
diff --git a/devel/haskell-mode/PLIST b/devel/haskell-mode/PLIST
index ecfe11a77f4..3afe8964404 100644
--- a/devel/haskell-mode/PLIST
+++ b/devel/haskell-mode/PLIST
@@ -1,24 +1,24 @@
-@comment $NetBSD: PLIST,v 1.3 2002/09/07 11:07:55 kristerw Exp $
+@comment $NetBSD: PLIST,v 1.4 2002/09/14 03:20:28 uebayasi Exp $
 share/doc/html/haskell-mode/.emacs
 share/doc/html/haskell-mode/fontlock.hs
 share/doc/html/haskell-mode/indent.hs
 share/doc/html/haskell-mode/index.html
 share/doc/html/haskell-mode/installation-guide.html
-${LISPDIR}/haskell-decl-scan.el
-${LISPDIR}/haskell-decl-scan.elc
-${LISPDIR}/haskell-doc.el
-${LISPDIR}/haskell-doc.elc
-${LISPDIR}/haskell-font-lock.el
-${LISPDIR}/haskell-font-lock.elc
-${LISPDIR}/haskell-ghci.el
-${LISPDIR}/haskell-ghci.elc
-${LISPDIR}/haskell-hugs.el
-${LISPDIR}/haskell-hugs.elc
-${LISPDIR}/haskell-indent.el
-${LISPDIR}/haskell-indent.elc
-${LISPDIR}/haskell-mode.el
-${LISPDIR}/haskell-mode.elc
-${LISPDIR}/haskell-simple-indent.el
-${LISPDIR}/haskell-simple-indent.elc
-@unexec ${RMDIR} %D/${LISPDIR} 2>/dev/null || true
+${EMACS_LISPPREFIX}/haskell-mode/haskell-decl-scan.el
+${EMACS_LISPPREFIX}/haskell-mode/haskell-decl-scan.elc
+${EMACS_LISPPREFIX}/haskell-mode/haskell-doc.el
+${EMACS_LISPPREFIX}/haskell-mode/haskell-doc.elc
+${EMACS_LISPPREFIX}/haskell-mode/haskell-font-lock.el
+${EMACS_LISPPREFIX}/haskell-mode/haskell-font-lock.elc
+${EMACS_LISPPREFIX}/haskell-mode/haskell-ghci.el
+${EMACS_LISPPREFIX}/haskell-mode/haskell-ghci.elc
+${EMACS_LISPPREFIX}/haskell-mode/haskell-hugs.el
+${EMACS_LISPPREFIX}/haskell-mode/haskell-hugs.elc
+${EMACS_LISPPREFIX}/haskell-mode/haskell-indent.el
+${EMACS_LISPPREFIX}/haskell-mode/haskell-indent.elc
+${EMACS_LISPPREFIX}/haskell-mode/haskell-mode.el
+${EMACS_LISPPREFIX}/haskell-mode/haskell-mode.elc
+${EMACS_LISPPREFIX}/haskell-mode/haskell-simple-indent.el
+${EMACS_LISPPREFIX}/haskell-mode/haskell-simple-indent.elc
+@dirrm ${EMACS_LISPPREFIX}/haskell-mode
 @dirrm share/doc/html/haskell-mode