summaryrefslogtreecommitdiff
path: root/misc/bbdb
diff options
context:
space:
mode:
authoruebayasi <uebayasi@pkgsrc.org>2008-10-11 09:31:54 +0000
committeruebayasi <uebayasi@pkgsrc.org>2008-10-11 09:31:54 +0000
commit34004f51e031966e3fbd210678c5083e196bf3e6 (patch)
tree28f89f081daec07805c1f982f0bc63a420c005ba /misc/bbdb
parent6bcc8c586e8d598300da44f38c8ec67a571ea234 (diff)
downloadpkgsrc-34004f51e031966e3fbd210678c5083e196bf3e6.tar.gz
Move mk/emacs.mk to editors/emacs/modules.mk.
Don't call pkg_info to get the installed Emacs version; always use the version matching EMACS_TYPE set by users. Be DEPENDS to it. This should address pkg/37146 by Aleksey Cheusov. While here convert some emacs lisp packages to user-destdir.
Diffstat (limited to 'misc/bbdb')
-rw-r--r--misc/bbdb/Makefile4
-rw-r--r--misc/bbdb/buildlink3.mk4
2 files changed, 4 insertions, 4 deletions
diff --git a/misc/bbdb/Makefile b/misc/bbdb/Makefile
index a3cf129283e..3d0347bc261 100644
--- a/misc/bbdb/Makefile
+++ b/misc/bbdb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2008/03/04 19:21:11 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2008/10/11 09:31:57 uebayasi Exp $
#
DISTNAME= bbdb-2.34
@@ -25,7 +25,7 @@ INFO_FILES= # PLIST
LISPDIR= ${EMACS_LISPPREFIX}/bbdb
INSTALLATION_DIRS= ${EMACS_INFOPREFIX}
-.include "../../mk/emacs.mk"
+.include "../../editors/emacs/modules.mk"
.if ${EMACS_FLAVOR} == "xemacs"
CONFIGURE_ARGS+= --with-emacs=xemacs
diff --git a/misc/bbdb/buildlink3.mk b/misc/bbdb/buildlink3.mk
index 1472adc74ed..6ddb7de9f66 100644
--- a/misc/bbdb/buildlink3.mk
+++ b/misc/bbdb/buildlink3.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.1 2007/10/29 12:41:18 uebayasi Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2008/10/11 09:31:57 uebayasi Exp $
#
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
BBDB_BUILDLINK3_MK:= ${BBDB_BUILDLINK3_MK}+
-.include "../../mk/emacs.mk"
+.include "../../editors/emacs/modules.mk"
.if ${EMACS_FLAVOR} == "emacs"
.if ${BUILDLINK_DEPTH} == "+"