diff options
author | jlam <jlam@pkgsrc.org> | 2001-08-23 04:26:51 +0000 |
---|---|---|
committer | jlam <jlam@pkgsrc.org> | 2001-08-23 04:26:51 +0000 |
commit | a17239c066dcfcad39db4003a2b8d421fa1bc881 (patch) | |
tree | 4bfa8b36ce531fe4f0f7472d5fdff888abf4b533 /editors/vim-xaw/Makefile | |
parent | 79fe9eff8ce0ebb615cb7a647fadec6607504307 (diff) | |
download | pkgsrc-a17239c066dcfcad39db4003a2b8d421fa1bc881.tar.gz |
Move per-package default XAW_TYPE setting above the inclusion of
bsd.prefs.mk so that it is actually used. Where possible, include
xaw.buildlink.mk instead of setting USE_XAW, and use LIBXAW where needed.
Diffstat (limited to 'editors/vim-xaw/Makefile')
-rw-r--r-- | editors/vim-xaw/Makefile | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/editors/vim-xaw/Makefile b/editors/vim-xaw/Makefile index 50fc6a6dbac..04681a0b0c0 100644 --- a/editors/vim-xaw/Makefile +++ b/editors/vim-xaw/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2001/08/06 17:44:45 pooka Exp $ +# $NetBSD: Makefile,v 1.15 2001/08/23 04:26:52 jlam Exp $ .include "../vim-share/Makefile.common" @@ -10,7 +10,6 @@ DEPENDS+= vim-share-${VIM_VERSION}:../vim-share CONFLICTS+= vim-[0-9]* vim-gtk-* USE_X11= yes -USE_XAW= yes USE_BUILDLINK_ONLY= yes CONFIGURE_ARGS+= --enable-gui=athena @@ -21,11 +20,11 @@ INSTALL_TARGET= installvimbin .include "../../mk/bsd.prefs.mk" -.if (${XAW_TYPE} == "standard") -MAKE_ENV+= XAW_LIB=Xaw +.if defined(XAW_TYPE) && (${XAW_TYPE} == "3d" || ${XAW_TYPE} == "xpm") +MAKE_ENV+= XAW_LIB="Xaw3d" .else -.include "../../x11/Xaw3d/buildlink.mk" -MAKE_ENV+= XAW_LIB=Xaw3d +XAW_TYPE= standard +MAKE_ENV+= XAW_LIB="Xaw" .endif post-install: @@ -39,4 +38,5 @@ post-install: done .include "../../devel/ncurses/buildlink.mk" +.include "../../mk/xaw.buildlink.mk" .include "../../mk/bsd.pkg.mk" |