diff options
| author | lukem <lukem@pkgsrc.org> | 2001-07-26 03:35:25 +0000 |
|---|---|---|
| committer | lukem <lukem@pkgsrc.org> | 2001-07-26 03:35:25 +0000 |
| commit | 08529a76ae5e94e1fe67c13f6be9247d9f4d9d54 (patch) | |
| tree | c6dbe43af966fb6ad97fe49a0f739cc8283501c3 /x11 | |
| parent | 851fe54af22e8eedb598a065d2f7a64cbbe7cbc0 (diff) | |
| download | pkgsrc-08529a76ae5e94e1fe67c13f6be9247d9f4d9d54.tar.gz | |
move .include "../../mk/bsd.prefs.mk" to before check for XLOCK_LIGHT
but after CHECK_MESA setting. this change makes setting XLOCK_LIGHT
actually DTRT if it is set in /etc/mk.conf (and seems to DTRT if
XLOCK_LIGHT isn't set).
i.e, on a machine without Mesa, by default it will attempt to install
Mesa (et al), unless XLOCK_LIGHT is set where it won't attempt to.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/xlockmore/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/x11/xlockmore/Makefile b/x11/xlockmore/Makefile index ba8f50affc8..0037c535bbf 100644 --- a/x11/xlockmore/Makefile +++ b/x11/xlockmore/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.44 2001/07/03 13:51:43 abs Exp $ +# $NetBSD: Makefile,v 1.45 2001/07/26 03:35:25 lukem Exp $ # FreeBSD Id: Makefile,v 1.23 1997/10/10 09:24:38 tg Exp # @@ -13,6 +13,8 @@ COMMENT= Like the XLock session locker/screen saver, but with more CHECK_MESA= YES +.include "../../mk/bsd.prefs.mk" + .if defined(XLOCK_LIGHT) CONFIGURE_ARGS+=--without-gltt --without-ttf --without-opengl --without-mesagl \ --without-xpm # --without-cxx XXX doesn't work @@ -23,8 +25,6 @@ USE_MESA= YES CONFIGURE_ARGS+= --with-mesagl .endif -.include "../../mk/bsd.prefs.mk" - .if !exists(${X11BASE}/lib/libXdpms.a) XLOCK_NO_DPMS= YES .endif |