diff options
Diffstat (limited to 'x11/libX11/patches/patch-ad')
| -rw-r--r-- | x11/libX11/patches/patch-ad | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/x11/libX11/patches/patch-ad b/x11/libX11/patches/patch-ad index 62b4f74faa9..947398ea33c 100644 --- a/x11/libX11/patches/patch-ad +++ b/x11/libX11/patches/patch-ad @@ -1,23 +1,22 @@ -$NetBSD: patch-ad,v 1.2 2007/08/05 22:39:38 joerg Exp $ +$NetBSD: patch-ad,v 1.3 2009/02/21 16:44:29 wiz Exp $ ---- src/util/Makefile.am.orig 2007-05-16 17:34:44.000000000 +0200 +--- src/util/Makefile.am.orig 2009-02-02 16:34:16.000000000 +0000 +++ src/util/Makefile.am -@@ -1,11 +1,15 @@ +@@ -1,9 +1,16 @@ # $XdotOrg: lib/X11/src/util/Makefile.am,v 1.4 2006-02-19 02:14:12 jamey Exp $ -noinst_PROGRAMS=makekeys -+noinst_PROGRAMS= makekeys$(EXEEXT) $(MAKEKEYS_PROG) ++noinst_PROGRAMS=makekeys $(MAKEKEYS_PROG) makekeys_CFLAGS=$(X11_CFLAGS) -+if CROSS_COMPILING -+MAKEKEYS_PROG= xmakekeys$(EXEEXT) --#override CC = gcc --LINK = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++if CROSS_COMPILING ++MAKEKEYS_PROG= xmakekeys$(EXEEXT) +xmakekeys$(EXEEXT): makekeys.c + $(CC_FOR_BUILD) $(X11_CFLAGS) $(CPPFLAGS_FOR_BUILD) \ -+ $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@ makekeys.c ++ $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@ makekeys.c +endif ++ + CC = @CC_FOR_BUILD@ EXTRA_DIST = mkks.sh - |