diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2011-10-22 18:26:51 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-10-22 18:26:51 +0200 |
commit | 2b52e67da00817f93884a344a9a8b7e2c585fc8c (patch) | |
tree | caa9c494197016efa62412c2483e36f011b2d392 /package/libX11/patches | |
parent | e8f74f7222ddc977bf775e31101980b9311b7200 (diff) | |
parent | 48b18373159b70caca3f41643804c549552d66f4 (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/libX11/patches')
-rw-r--r-- | package/libX11/patches/patch-src_util_Makefile_in | 17 |
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 $@ $< |