Mercurial > mxe-octave

view src/gnuplot-3-iconv.patch @ 3892:b42e8f913ddc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
of-database: added of package * src/of-database.mk: new file * dist-files.mk: add of-database.mk, of-database-1-cross-fixes.patch * Makefile.am: add database to octave forge packages * index.html: add of-database * build_packages.m: add of-database package * src/of-database-1-cross-fixes.patch: new file
author John Donoghue
date Fri, 10 Apr 2015 07:35:38 -0400
parents ceeb3ec75690
children
line wrap: on
line source

diff -ur gnuplot-4.6.4.orig/config/mingw/Makefile gnuplot-4.6.4/config/mingw/Makefile
--- gnuplot-4.6.4.orig/config/mingw/Makefile	2014-07-24 20:30:33 -0400
+++ gnuplot-4.6.4/config/mingw/Makefile	2014-07-24 20:30:50 -0400
@@ -382,8 +382,9 @@
 endif
 
 ifdef ICONV
-	CFLAGS += -DHAVE_ICONV
-	TERMLIBS += -liconv
+	CFLAGS += -DHAVE_ICONV $(ICONV_CFLAGS)
+        LDFLAGS += $(ICONV_LDFLAGS)
+	TERMLIBS += -liconv 
 endif
 
 ifdef GNU_RC