annotate src/gnuplot-3-iconv.patch @ 3865:4e204ea06bc8
qt.mk: only depend on fontconfig if $(USE_SYSTEM_FONTCONFIG) is set to "no"
author |
John W. Eaton <jwe@octave.org> |
date |
Thu, 26 Mar 2015 09:05:37 -0400 |
parents |
ceeb3ec75690 |
children |
|
rev |
line source |
3668
|
1 diff -ur gnuplot-4.6.4.orig/config/mingw/Makefile gnuplot-4.6.4/config/mingw/Makefile |
|
2 --- gnuplot-4.6.4.orig/config/mingw/Makefile 2014-07-24 20:30:33 -0400 |
|
3 +++ gnuplot-4.6.4/config/mingw/Makefile 2014-07-24 20:30:50 -0400 |
|
4 @@ -382,8 +382,9 @@ |
|
5 endif |
|
6 |
|
7 ifdef ICONV |
|
8 - CFLAGS += -DHAVE_ICONV |
|
9 - TERMLIBS += -liconv |
|
10 + CFLAGS += -DHAVE_ICONV $(ICONV_CFLAGS) |
|
11 + LDFLAGS += $(ICONV_LDFLAGS) |
|
12 + TERMLIBS += -liconv |
|
13 endif |
|
14 |
|
15 ifdef GNU_RC |