Use mk/emacs.mk.

2 files changed, 33 insertions, 40 deletions

diff --git a/devel/elib/Makefile b/devel/elib/Makefile
index a2ee8e1c9ef..2aa345c0a20 100644
--- a/devel/elib/Makefile
+++ b/devel/elib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2002/02/18 15:14:09 seb Exp $
+# $NetBSD: Makefile,v 1.4 2002/09/14 02:49:54 uebayasi Exp $
 #
 
 DISTNAME=	elib-1.0
@@ -10,18 +10,11 @@ COMMENT=	Library of utility functions for Emacs
 
 .include "../../mk/bsd.prefs.mk"
 
-.if defined(USE_XEMACS)
-DEPENDS+=	 	xemacs-[0-9]*:../../editors/xemacs
-EMACS=			xemacs
-LISPDIR=		lib/xemacs/xemacs-packages/lisp/elib
-.else
-DEPENDS+=	 	emacs-[0-9]*:../../editors/emacs
-EMACS=			emacs
-LISPDIR=		share/emacs/site-lisp/elib
-.endif
+.include "../../mk/emacs.mk"
 
-BUILD_ENV+=	EMACS=${EMACS}
-PLIST_SUBST+=	LISPDIR=${LISPDIR}
+BUILD_ENV+=	EMACS=${EMACS_FLAVOR}
+
+MAKEFLAGS+=	EMACS=${EMACS_FLAVOR}
 
 NO_CONFIGURE=	# set
 USE_GMAKE=	# set
@@ -33,9 +26,9 @@ SRCS=	stack-f.el stack-m.el queue-f.el queue-m.el elib-node.el	\
 	dll-debug.el
 
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/${LISPDIR}
+	${INSTALL_DATA_DIR} ${EMACS_LISPPREFIX}/elib
 	cd ${WRKSRC} && ${INSTALL_DATA} ${SRCS} ${SRCS:.el=.elc} 	\
-			${PREFIX}/${LISPDIR}
+			${EMACS_LISPPREFIX}/elib
 	cd ${WRKSRC} && ${INSTALL_DATA} ${INFO_FILES} ${PREFIX}/info
 
 .include "../../mk/texinfo.mk"
diff --git a/devel/elib/PLIST b/devel/elib/PLIST
index a02454d743b..68643e689c9 100644
--- a/devel/elib/PLIST
+++ b/devel/elib/PLIST
@@ -1,26 +1,26 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:23:22 zuntum Exp $
-${LISPDIR}/stack-f.el
-${LISPDIR}/stack-f.elc
-${LISPDIR}/stack-m.el
-${LISPDIR}/stack-m.elc
-${LISPDIR}/queue-f.el
-${LISPDIR}/queue-f.elc
-${LISPDIR}/queue-m.el
-${LISPDIR}/queue-m.elc
-${LISPDIR}/elib-node.el
-${LISPDIR}/elib-node.elc
-${LISPDIR}/bintree.el
-${LISPDIR}/bintree.elc
-${LISPDIR}/avltree.el
-${LISPDIR}/avltree.elc
-${LISPDIR}/string.el
-${LISPDIR}/string.elc
-${LISPDIR}/read.el
-${LISPDIR}/read.elc
-${LISPDIR}/cookie.el
-${LISPDIR}/cookie.elc
-${LISPDIR}/dll.el
-${LISPDIR}/dll.elc
-${LISPDIR}/dll-debug.el
-${LISPDIR}/dll-debug.elc
-@dirrm ${LISPDIR}
+@comment $NetBSD: PLIST,v 1.2 2002/09/14 02:49:54 uebayasi Exp $
+${EMACS_LISPPREFIX}/elib/stack-f.el
+${EMACS_LISPPREFIX}/elib/stack-f.elc
+${EMACS_LISPPREFIX}/elib/stack-m.el
+${EMACS_LISPPREFIX}/elib/stack-m.elc
+${EMACS_LISPPREFIX}/elib/queue-f.el
+${EMACS_LISPPREFIX}/elib/queue-f.elc
+${EMACS_LISPPREFIX}/elib/queue-m.el
+${EMACS_LISPPREFIX}/elib/queue-m.elc
+${EMACS_LISPPREFIX}/elib/elib-node.el
+${EMACS_LISPPREFIX}/elib/elib-node.elc
+${EMACS_LISPPREFIX}/elib/bintree.el
+${EMACS_LISPPREFIX}/elib/bintree.elc
+${EMACS_LISPPREFIX}/elib/avltree.el
+${EMACS_LISPPREFIX}/elib/avltree.elc
+${EMACS_LISPPREFIX}/elib/string.el
+${EMACS_LISPPREFIX}/elib/string.elc
+${EMACS_LISPPREFIX}/elib/read.el
+${EMACS_LISPPREFIX}/elib/read.elc
+${EMACS_LISPPREFIX}/elib/cookie.el
+${EMACS_LISPPREFIX}/elib/cookie.elc
+${EMACS_LISPPREFIX}/elib/dll.el
+${EMACS_LISPPREFIX}/elib/dll.elc
+${EMACS_LISPPREFIX}/elib/dll-debug.el
+${EMACS_LISPPREFIX}/elib/dll-debug.elc
+@dirrm ${EMACS_LISPPREFIX}/elib