diff options
| author | uebayasi <uebayasi@pkgsrc.org> | 2007-10-29 04:43:17 +0000 |
|---|---|---|
| committer | uebayasi <uebayasi@pkgsrc.org> | 2007-10-29 04:43:17 +0000 |
| commit | 1414e8a6c974b76dbec030c902c493b1b72d4abe (patch) | |
| tree | 6bf4cd7c4b41ca3d5567234bd690364aafed1cdc /mail | |
| parent | 9fcd0707398aa3dec5dd30af72d448dd17ad32a8 (diff) | |
| download | pkgsrc-1414e8a6c974b76dbec030c902c493b1b72d4abe.tar.gz | |
Sort variables depending on ${EMACS_FLAVOR} (emacs or xemacs). Prefer
assignment to conditional. Include mk/emacs.mk lazily.
No functional changes intended.
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/vm/Makefile | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/mail/vm/Makefile b/mail/vm/Makefile index cc440221ade..01184d62d08 100644 --- a/mail/vm/Makefile +++ b/mail/vm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2006/04/05 15:50:27 jlam Exp $ +# $NetBSD: Makefile,v 1.31 2007/10/29 04:43:17 uebayasi Exp $ DISTNAME= vm-7.19 PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME} @@ -21,17 +21,9 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.wonderworks.com/vm/ COMMENT= VM (View Mail) is an advanced mail user agent for Emacs -.include "../../mk/emacs.mk" - USE_TOOLS+= makeinfo INFO_FILES= # PLIST -.if ${EMACS_FLAVOR} == "xemacs" -PIXMAPDIR= ${EMACS_LISPPREFIX:H}/etc/vm -.elif ${EMACS_FLAVOR} == "emacs" -PIXMAPDIR= ${EMACS_LISPPREFIX}/vm/pixmaps -.endif - MAKEFLAGS+= EMACS=${EMACS_BIN:Q} MAKE_ENV+= LISPDIR=${EMACS_LISPPREFIX}/vm MAKE_ENV+= INFODIR=${INFODIR:Q} @@ -42,6 +34,10 @@ PLIST_SUBST+= PIXMAPDIR=${PIXMAPDIR:S/^${PREFIX}\///:Q} INSTALLATION_DIRS= bin ${EMACS_INFOPREFIX} ${EMACS_LISPPREFIX}/vm \ ${PIXMAPDIR} +PIXMAPDIR= ${PIXMAPDIR.${EMACS_FLAVOR}} +PIXMAPDIR.emacs= ${EMACS_LISPPREFIX}/vm/pixmaps +PIXMAPDIR.xemacs= ${EMACS_LISPPREFIX:H}/etc/vm + do-install: cd ${WRKSRC} && ${INSTALL_DATA} *.el* ${EMACS_LISPPREFIX}/vm cd ${WRKSRC}; for f in *.info *.info-[0-9]*; do \ @@ -52,4 +48,6 @@ do-install: cd ${WRKSRC} && ${INSTALL_PROGRAM} qp-decode qp-encode \ base64-decode base64-encode ${PREFIX}/bin +.include "../../mk/emacs.mk" + .include "../../mk/bsd.pkg.mk" |