diff options
| author | uebayasi <uebayasi> | 2007-10-29 04:57:17 +0000 |
|---|---|---|
| committer | uebayasi <uebayasi> | 2007-10-29 04:57:17 +0000 |
| commit | 3a8b6e8b2959bee99de969acebe058c12a81eb9a (patch) | |
| tree | 1b60a481c72de88741649304c0badf26dfb8803b /www/w3 | |
| parent | ccbe36da13f152f8decf62eb92f9d82cb58dacec (diff) | |
| download | pkgsrc-3a8b6e8b2959bee99de969acebe058c12a81eb9a.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 'www/w3')
| -rw-r--r-- | www/w3/Makefile | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/www/w3/Makefile b/www/w3/Makefile index 95dbf3db85d..635bc624000 100644 --- a/www/w3/Makefile +++ b/www/w3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2006/10/04 22:04:10 wiz Exp $ +# $NetBSD: Makefile,v 1.24 2007/10/29 04:57:17 uebayasi Exp $ DISTNAME= w3-4.0pre.47 PKGNAME= ${EMACS_PKGNAME_PREFIX}w3-4.0b47 @@ -11,8 +11,8 @@ HOMEPAGE= http://www.gnu.org/software/w3/ COMMENT= World Wide Web browser for Emacs # included in xemacs-packages -EMACS_VERSIONS_ACCEPTED= emacs21 emacs21nox emacs20 -.include "../../mk/emacs.mk" +# emacs22 doesn't work +EMACS_VERSIONS_ACCEPTED= emacs21 emacs21nox emacs20 GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-emacs @@ -21,11 +21,13 @@ CONFIGURE_ARGS+= --with-lispdir=${EMACS_LISPPREFIX}/w3 CONFIGURE_ARGS+= --datadir=${ETCDIR} INFO_FILES= # PLIST -.if ${EMACS_FLAVOR} == "xemacs" -ETCDIR= ${EMACS_LISPPREFIX:H}/etc/w3 -.else -ETCDIR= ${PREFIX}/share/w3 -.endif -PLIST_SUBST+= ETCDIR=${ETCDIR:S/^${PREFIX}\///:Q} +PLIST_SUBST+= ETCDIR=${ETCDIR:S/^${PREFIX}\///:Q} + +ETCDIR= ${ETCDIR.${EMACS_FLAVOR}} + +ETCDIR.emacs= ${PREFIX}/share/w3 +ETCDIR.xemacs= ${EMACS_LISPPREFIX:H}/etc/w3 + +.include "../../mk/emacs.mk" .include "../../mk/bsd.pkg.mk" |