Mercurial > mxe-octave
view src/gnuplot-3-iconv.patch @ 3721:933b99febcf1
Expand options to support 3 possible sources of octave
* configure.ac: modify --enable-stable rule to --enable-octave=source (stable,alpha,default)
* Makefile.am: modify OCTAVE_TARGET based on octave build value set in configure.
* index.html: added master-octave information.
* src/default-octave.mk: new file.
* src/default-octave-1-docinstall.patch
* dist-files.mk: add default-octave-1-docinstall.patch default-octave.mk
* binary-dist-rules.mk: use OCTAVE_TARGET to decide on tarball/installer name
author | John Donoghue <john.donoghue@ieee.org> |
---|---|
date | Sun, 19 Oct 2014 22:58:20 -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