summaryrefslogtreecommitdiff
path: root/package/libX11/patches/patch-src_util_Makefile_in
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2011-10-22 07:12:19 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2011-10-22 07:12:19 +0200
commit48b18373159b70caca3f41643804c549552d66f4 (patch)
tree8f3ffa76ec9d815777f85b62caa5e778d0f7beef /package/libX11/patches/patch-src_util_Makefile_in
parent8366ec6a2404cf4b75158b39faabc29a8a1ed8a0 (diff)
parenta58a6ff7e5a354b7f743ebdba219f42655c1695b (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/libX11/patches/patch-src_util_Makefile_in')
-rw-r--r--package/libX11/patches/patch-src_util_Makefile_in17
1 files changed, 14 insertions, 3 deletions
diff --git a/package/libX11/patches/patch-src_util_Makefile_in b/package/libX11/patches/patch-src_util_Makefile_in
index 2c1689069..6af15c2b5 100644
--- a/package/libX11/patches/patch-src_util_Makefile_in
+++ b/package/libX11/patches/patch-src_util_Makefile_in
@@ -1,13 +1,24 @@
--- libX11-1.4.0.orig/src/util/Makefile.in 2010-11-21 23:15:55.000000000 +0100
-+++ libX11-1.4.0/src/util/Makefile.in 2011-04-28 22:56:41.000000000 +0200
-@@ -262,7 +262,6 @@ top_build_prefix = @top_build_prefix@
++++ libX11-1.4.0/src/util/Makefile.in 2011-10-21 09:41:05.000000000 +0200
+@@ -143,7 +143,7 @@ LD = @LD@
+ LDFLAGS = @LDFLAGS_FOR_BUILD@
+ LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
+ LIBOBJS = @LIBOBJS@
+-LIBS = @LIBS@
++LIBS =
+ LIBTOOL = @LIBTOOL@
+ LIB_MAN_DIR = @LIB_MAN_DIR@
+ LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
+@@ -262,8 +262,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
makekeys_CFLAGS = \
- $(X11_CFLAGS) \
- $(CWARNFLAGS)
+- $(CWARNFLAGS)
++ $(CWARNFLAGS) -I/usr/local/include
EXTRA_DIST = mkks.sh
+
@@ -351,12 +350,12 @@ distclean-compile:
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<