Mercurial > mxe-octave

changeset 3022:a542328fc284

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update freetds,gnuplot to use MXE_XXXX set tools * src/gnuplot.mk, src/freetds.mk: change $(TARGET)-xxxx to $(MXE_XXX) tools.
author John Donoghue <john.donoghue@ieee.org>
date Sat, 08 Jun 2013 10:46:24 -0400
parents 6ea3d6ad4f44
children 7bcade70f016
files src/freetds.mk src/gnuplot.mk
diffstat 2 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/freetds.mk	Sat Jun 08 10:43:11 2013 -0400
+++ b/src/freetds.mk	Sat Jun 08 10:46:24 2013 -0400
@@ -35,6 +35,6 @@
         --disable-threadsafe \
         --with-tdsver=7.2 \
         --with-gnutls \
-        PKG_CONFIG='$(TARGET)-pkg-config'
+        PKG_CONFIG='$(MXE_PKG_CONFIG)'
     $(MAKE) -C '$(1)' -j '$(JOBS)' install man_MANS=
 endef
--- a/src/gnuplot.mk	Sat Jun 08 10:43:11 2013 -0400
+++ b/src/gnuplot.mk	Sat Jun 08 10:46:24 2013 -0400
@@ -16,9 +16,9 @@
 
 ifeq ($(MXE_SYSTEM),mingw)
 define $(PKG)_BUILD
-    make -C '$(1)/config/mingw' CC='$(TARGET)-gcc' CXX='$(TARGET)-g++' RC='$(TARGET)-windres' -j '$(JOBS)' TARGET=gnuplot.exe gnuplot.exe
-    make -C '$(1)/config/mingw' CC='$(TARGET)-gcc' CXX='$(TARGET)-g++' RC='$(TARGET)-windres' -j '$(JOBS)' TARGET=wgnuplot.exe wgnuplot.exe
-    make -C '$(1)/config/mingw' CC='$(TARGET)-gcc' CXX='$(TARGET)-g++' RC='$(TARGET)-windres' -j '$(JOBS)' wgnuplot.mnu
+    make -C '$(1)/config/mingw' CC='$(MXE_CC)' CXX='$(MXE_CXX)' RC='$(MXE_WINDRES)' -j '$(JOBS)' TARGET=gnuplot.exe gnuplot.exe
+    make -C '$(1)/config/mingw' CC='$(MXE_CC)' CXX='$(MXE_CXX)' RC='$(MXE_WINDRES)' -j '$(JOBS)' TARGET=wgnuplot.exe wgnuplot.exe
+    make -C '$(1)/config/mingw' CC='$(MXE_CC)' CXX='$(MXE_CXX)' RC='$(MXE_WINDRES)' -j '$(JOBS)' wgnuplot.mnu
 
     $(INSTALL) -d '$(HOST_BINDIR)'
     $(INSTALL) -m755 '$(1)/config/mingw/gnuplot.exe' '$(HOST_BINDIR)'