diff options
| author | joerg <joerg> | 2007-06-15 17:43:40 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2007-06-15 17:43:40 +0000 |
| commit | 34d01cf9bddc8406203586e334f5c9b1d7d1184f (patch) | |
| tree | 1bf1569a6ac7220d6ed8d5bf29fa3678570afd56 /wm | |
| parent | 7d6180e7de0c9203023c604fefcf5855f06172f1 (diff) | |
| download | pkgsrc-34d01cf9bddc8406203586e334f5c9b1d7d1184f.tar.gz | |
Fix Xinerama for !native case.
Diffstat (limited to 'wm')
| -rw-r--r-- | wm/golem/Makefile | 7 | ||||
| -rw-r--r-- | wm/icewm/Makefile.common | 6 |
2 files changed, 9 insertions, 4 deletions
diff --git a/wm/golem/Makefile b/wm/golem/Makefile index fe96ba1350c..f740e686db9 100644 --- a/wm/golem/Makefile +++ b/wm/golem/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2006/12/27 13:37:41 joerg Exp $ +# $NetBSD: Makefile,v 1.25 2007/06/15 17:44:45 joerg Exp $ # DISTNAME= golem-0.0.5 @@ -15,8 +15,11 @@ GNU_CONFIGURE= YES CONFIGURE_ARGS+= --enable-i18n -.if exists(${X11BASE}/include/X11/extensions/Xinerama.h) +.include "../../mk/bsd.prefs.mk" + +.if ${X11_TYPE} != "native" || exists(${X11BASE}/include/X11/extensions/Xinerama.h) CONFIGURE_ARGS+= --enable-xinerama +.include "../../x11/libXinerama/buildlink3.mk" .endif PKG_OPTIONS_VAR= PKG_OPTIONS.golem diff --git a/wm/icewm/Makefile.common b/wm/icewm/Makefile.common index a4c3bc778ed..36dcd4a3c33 100644 --- a/wm/icewm/Makefile.common +++ b/wm/icewm/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.57 2006/12/15 20:33:02 joerg Exp $ +# $NetBSD: Makefile.common,v 1.58 2007/06/15 17:43:40 joerg Exp $ DISTNAME= icewm-1.2.27 CATEGORIES= x11 wm @@ -24,7 +24,9 @@ USE_LANGUAGES= c c++ CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} CONFIGURE_ARGS+= --with-cfgdir=${PKG_SYSCONFDIR:Q} -.if !exists(${X11BASE}/include/X11/extensions/Xinerama.h) +.if ${X11_TYPE} != "native" +.include "../../x11/libXinerama/buildlink3.mk" +.elif !exists(${X11BASE}/include/X11/extensions/Xinerama.h) CONFIGURE_ARGS+= --disable-xinerama .endif MAKE_FLAGS+= LOCDIR=${PREFIX}/${PKGLOCALEDIR}/locale |