Mercurial > mxe-octave

diff Makefile @ 3014:b6c7244a2f66

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use HOST_BINDIR, HOST_LIBDIR, and HOST_INCDIR instead of MXE_BINDIR, MXE_LIBDIR, and MXE_INCDIR. Attempt to use these variables consistently instead of using $(HOST_PREFIX)/bin, $(HOST_PREFIX)/lib, and $(HOST_PREFIX)/include
author John W. Eaton <jwe@octave.org>
date Sun, 02 Jun 2013 16:59:24 -0400
parents bcc26ffe9a0f
children ec6f91539788
line wrap: on
line diff
--- a/Makefile	Sun Jun 02 12:40:32 2013 -0400
+++ b/Makefile	Sun Jun 02 16:59:24 2013 -0400
@@ -139,9 +139,9 @@
   MAKE_SHARED_FROM_STATIC_OPTIONS := --windowsdll
 endif
 
-MXE_BINDIR := '$(HOST_PREFIX)/bin'
-MXE_LIBDIR := '$(HOST_PREFIX)/lib'
-MXE_INCDIR := '$(HOST_PREFIX)/include'
+HOST_BINDIR := '$(HOST_PREFIX)/bin'
+HOST_LIBDIR := '$(HOST_PREFIX)/lib'
+HOST_INCDIR := '$(HOST_PREFIX)/include'
 
 ifeq ($(MXE_SYSTEM),mingw)
   ifneq ($(MXE_NATIVE_BUILD),yes)
@@ -153,10 +153,10 @@
     NOTEPAD_BASE_DIR := $(TOP_DIR)/notepad++
   endif
 else
-  LD_LIBRARY_PATH := '$(MXE_LIBDIR)'
+  LD_LIBRARY_PATH := '$(HOST_LIBDIR)'
   export LD_LIBRARY_PATH
-  MXE_CPPFLAGS := '-I$(MXE_INCDIR)'
-  MXE_LDFLAGS := '-L$(MXE_LIBDIR)'
+  MXE_CPPFLAGS := '-I$(HOST_INCDIR)'
+  MXE_LDFLAGS := '-L$(HOST_LIBDIR)'
 endif
 
 LN := ln