diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-02-26 14:21:25 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-02-26 14:21:25 +0100 |
| commit | 27537f0ac386cd2d869a73d2c4d432be2dffb9eb (patch) | |
| tree | 8d0d6a6026aa6c0a7b5bbd777ef9ed65f916fa78 /package/fontconfig/patches/patch-fc-case_Makefile_in | |
| parent | 1dbfbd6e0c5c2738f2f8d3b9b8ff0a3a9dc4e529 (diff) | |
| parent | 67cb0759e674470fa53fd3711d8460fd4a12c1a3 (diff) | |
resolve xterm Makefile conflict
Diffstat (limited to 'package/fontconfig/patches/patch-fc-case_Makefile_in')
| -rw-r--r-- | package/fontconfig/patches/patch-fc-case_Makefile_in | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/package/fontconfig/patches/patch-fc-case_Makefile_in b/package/fontconfig/patches/patch-fc-case_Makefile_in index cc0e60571..ed5a403ed 100644 --- a/package/fontconfig/patches/patch-fc-case_Makefile_in +++ b/package/fontconfig/patches/patch-fc-case_Makefile_in @@ -1,7 +1,11 @@ --- fontconfig-2.8.0.orig/fc-case/Makefile.in 2009-11-19 00:49:38.000000000 +0100 -+++ fontconfig-2.8.0/fc-case/Makefile.in 2009-12-04 20:03:05.536919385 +0100 -@@ -87,17 +87,17 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUD - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++++ fontconfig-2.8.0/fc-case/Makefile.in 2011-02-24 14:30:29.000000000 +0100 +@@ -84,20 +84,20 @@ depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles + am__mv = mv -f + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ +- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) AM_V_CC = $(am__v_CC_$(V)) am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) -am__v_CC_0 = @echo " CC " $@; @@ -26,7 +30,7 @@ CCDEPMODE = @CCDEPMODE@ CC_FOR_BUILD = @CC_FOR_BUILD@ -CFLAGS = @CFLAGS@ -+CFLAGS = ++CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@ CONFDIR = @CONFDIR@ CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ |