diff options
| author | jschauma <jschauma@pkgsrc.org> | 2004-06-08 17:48:24 +0000 |
|---|---|---|
| committer | jschauma <jschauma@pkgsrc.org> | 2004-06-08 17:48:24 +0000 |
| commit | c9d6d376c48d37e94d8ac0e0a6be3ec1cfd66113 (patch) | |
| tree | 91f309d96179c494217f3257a92316efa4078b6e /x11/controlcenter | |
| parent | 8fecfaf7a94313f83344021b1d79aeaaf7ff2884 (diff) | |
| download | pkgsrc-c9d6d376c48d37e94d8ac0e0a6be3ec1cfd66113.tar.gz | |
Short: make this compile on Linux
Long:
Some OS have libintl functionality in libc, so we do not necessarily
have to link against (a possibly non-existent) -lintl. For now, only
deal with Linux -- those who know for a fact which OS also behave
this way should adjust/add.
Diffstat (limited to 'x11/controlcenter')
| -rw-r--r-- | x11/controlcenter/Makefile | 9 | ||||
| -rw-r--r-- | x11/controlcenter/patches/patch-ab | 4 |
2 files changed, 10 insertions, 3 deletions
diff --git a/x11/controlcenter/Makefile b/x11/controlcenter/Makefile index 0e64b8e1737..fb8c3b110d1 100644 --- a/x11/controlcenter/Makefile +++ b/x11/controlcenter/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.62 2004/04/25 04:16:44 xtraeme Exp $ +# $NetBSD: Makefile,v 1.63 2004/06/08 17:48:24 jschauma Exp $ DISTNAME= control-center-1.4.0.4 PKGREVISION= 7 @@ -24,6 +24,13 @@ LOCALSTATEDIR= ${X11PREFIX}/var GNU_CONFIGURE= YES CONFIGURE_ARGS+= --localstatedir=${LOCALSTATEDIR} +.include "../../mk/bsd.prefs.mk" + +# Linux has libintl functionality in libc +.if ${OPSYS} != "Linux" +CONFIGURE_ENV+= INTLLIBS="-lintl" +.endif + post-patch: @${ECHO} >>${WRKSRC}/control-center/cappletConf.sh.in "" diff --git a/x11/controlcenter/patches/patch-ab b/x11/controlcenter/patches/patch-ab index b5ae1d84eb3..6f47ee85385 100644 --- a/x11/controlcenter/patches/patch-ab +++ b/x11/controlcenter/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.5 2002/08/29 08:42:52 jlam Exp $ +$NetBSD: patch-ab,v 1.6 2004/06/08 17:48:25 jschauma Exp $ --- configure.orig Sun Feb 10 16:36:55 2002 +++ configure @@ -18,7 +18,7 @@ $NetBSD: patch-ab,v 1.5 2002/08/29 08:42:52 jlam Exp $ +# NetBSD: set DATADIRNAME to "share" +DATADIRNAME="share" +INTLDEPS= -+INTLLIBS="-lintl" ++INTLLIBS="${INTLLIBS}" + for ac_hdr in dlfcn.h dl.h do |