From cfbaf3ee45ea80af79e227df289eb2f8804ef76e Mon Sep 17 00:00:00 2001 From: jasper Date: Sat, 23 Oct 2010 11:10:18 +0000 Subject: [PATCH] - dont set CONFIGURE_STYLE to gnu when we're using the waf module. --- x11/gnome/Makefile.inc | 4 +++- x11/gnome/hamster-applet/Makefile | 5 ++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/x11/gnome/Makefile.inc b/x11/gnome/Makefile.inc index a020e2d6957..a9590fe8afc 100644 --- a/x11/gnome/Makefile.inc +++ b/x11/gnome/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.9 2009/02/11 15:47:49 jasper Exp $ +# $OpenBSD: Makefile.inc,v 1.10 2010/10/23 11:10:18 jasper Exp $ DIST_SUBDIR= gnome @@ -8,5 +8,7 @@ MAINTAINER?= Jasper Lievisse Adriaanse , \ Antoine Jacoutot .if !defined(NO_BUILD) +. if !defined(MODULES) || !${MODULES:Mdevel/waf} CONFIGURE_STYLE?= gnu +. endif .endif diff --git a/x11/gnome/hamster-applet/Makefile b/x11/gnome/hamster-applet/Makefile index a149686a67c..5b09dc6c31c 100644 --- a/x11/gnome/hamster-applet/Makefile +++ b/x11/gnome/hamster-applet/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.26 2010/10/18 13:18:14 jasper Exp $ +# $OpenBSD: Makefile,v 1.27 2010/10/23 11:10:18 jasper Exp $ COMMENT= time tracker applet for GNOME @@ -57,6 +57,5 @@ post-install: .include -# Need to override the defaults set by the gconf and gnome module -CONFIGURE_STYLE= +# Need to override the defaults set by the gconf module CONFIGURE_ARGS=