diff options
| author | uebayasi <uebayasi@pkgsrc.org> | 2008-10-11 09:31:54 +0000 |
|---|---|---|
| committer | uebayasi <uebayasi@pkgsrc.org> | 2008-10-11 09:31:54 +0000 |
| commit | b887f5681b4a4a2ce89af874eb1f9c822306ac8d (patch) | |
| tree | 28f89f081daec07805c1f982f0bc63a420c005ba /editors/mule-ucs | |
| parent | 5382ccf1d8130e9becd9b52c424e302b2acaf056 (diff) | |
| download | pkgsrc-b887f5681b4a4a2ce89af874eb1f9c822306ac8d.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 'editors/mule-ucs')
| -rw-r--r-- | editors/mule-ucs/Makefile | 12 | ||||
| -rw-r--r-- | editors/mule-ucs/buildlink3.mk | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/editors/mule-ucs/Makefile b/editors/mule-ucs/Makefile index a11478b728b..714bc8aad5d 100644 --- a/editors/mule-ucs/Makefile +++ b/editors/mule-ucs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2008/03/03 18:25:52 jlam Exp $ +# $NetBSD: Makefile,v 1.18 2008/10/11 09:31:56 uebayasi Exp $ DISTNAME= Mule-UCS-0.84 PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME} @@ -11,6 +11,10 @@ MAINTAINER= uebayasi@NetBSD.org COMMENT= Another encoding conversion mechanism for Emacs PKG_DESTDIR_SUPPORT= user-destdir +INSTALLATION_DIRS= ${EMACS_LISPPREFIX:C|^${PREFIX}/||}/mule-ucs \ + ${EMACS_LISPPREFIX:C|^${PREFIX}/||}/mule-ucs/big5conv \ + ${EMACS_LISPPREFIX:C|^${PREFIX}/||}/mule-ucs/jisx0213 \ + ${EMACS_LISPPREFIX:C|^${PREFIX}/||}/mule-ucs/reldata # Mule 4.1 feature required by Mule-UCS was added to 20.7nb1. EMACS_VERSIONS_ACCEPTED= emacs21 emacs21nox emacs20 @@ -27,20 +31,16 @@ do-build: ${EMACS_BIN} -q --no-site-file -batch -l x0213-comp.el do-install: - ${INSTALL_DATA_DIR} ${DESTDIR}${EMACS_LISPPREFIX}/mule-ucs cd ${WRKSRC}/lisp && \ for f in ChangeLog README* *.txt *.el *.elc *.txt; do \ ${INSTALL_DATA} $$f ${DESTDIR}${EMACS_LISPPREFIX}/mule-ucs; \ done - ${INSTALL_DATA_DIR} ${DESTDIR}${EMACS_LISPPREFIX}/mule-ucs/big5conv ${INSTALL_DATA} ${WRKSRC}/lisp/big5conv/* \ ${DESTDIR}${EMACS_LISPPREFIX}/mule-ucs/big5conv; \ - ${INSTALL_DATA_DIR} ${DESTDIR}${EMACS_LISPPREFIX}/mule-ucs/jisx0213 ${INSTALL_DATA} ${WRKSRC}/lisp/jisx0213/* \ ${DESTDIR}${EMACS_LISPPREFIX}/mule-ucs/jisx0213; \ - ${INSTALL_DATA_DIR} ${DESTDIR}${EMACS_LISPPREFIX}/mule-ucs/reldata ${INSTALL_DATA} ${WRKSRC}/lisp/reldata/* \ ${DESTDIR}${EMACS_LISPPREFIX}/mule-ucs/reldata -.include "../../mk/emacs.mk" +.include "../../editors/emacs/modules.mk" .include "../../mk/bsd.pkg.mk" diff --git a/editors/mule-ucs/buildlink3.mk b/editors/mule-ucs/buildlink3.mk index 7c994a4bdb2..1fad14e30e7 100644 --- a/editors/mule-ucs/buildlink3.mk +++ b/editors/mule-ucs/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2007/10/29 12:41:17 uebayasi Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2008/10/11 09:31:56 uebayasi Exp $ # BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ @@ -9,7 +9,7 @@ MULE_UCS_BUILDLINK3_MK:= ${MULE_UCS_BUILDLINK3_MK}+ # incorporated Unicode support. # -.include "../../mk/emacs.mk" +.include "../../editors/emacs/modules.mk" .if ${EMACS_FLAVOR} == "emacs" && ${EMACS_VERSION_MAJOR} < 22 .if ${BUILDLINK_DEPTH} == "+" |