Mercurial > mxe-octave

diff src/boost.mk @ 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 100e618349f7
children 951da75fd09c
line wrap: on
line diff
--- a/src/boost.mk	Sun Jun 02 12:40:32 2013 -0400
+++ b/src/boost.mk	Sun Jun 02 16:59:24 2013 -0400
@@ -20,7 +20,7 @@
     # context switched library introduced in boost 1.51.0 does not build
     rm -r '$(1)/libs/context'
     # old version appears to interfere
-    rm -rf '$(HOST_PREFIX)/include/boost/'
+    rm -rf '$(HOST_INCDIR)/boost'
     echo 'using gcc : : $(TARGET)-g++ : <rc>$(TARGET)-windres <archiver>$(TARGET)-ar ;' > '$(1)/user-config.jam'
     # compile boost jam
     cd '$(1)/tools/build/v2/engine' && ./build.sh
@@ -36,16 +36,16 @@
         --without-mpi \
         --without-python \
         --prefix='$(HOST_PREFIX)' \
-        --exec-prefix='$(HOST_PREFIX)/bin' \
-        --libdir='$(HOST_PREFIX)/lib' \
-        --includedir='$(HOST_PREFIX)/include' \
-        -sEXPAT_INCLUDE='$(HOST_PREFIX)/include' \
-        -sEXPAT_LIBPATH='$(HOST_PREFIX)/lib' \
+        --exec-prefix='$(HOST_BINDIR)' \
+        --libdir='$(HOST_LIBDIR)' \
+        --includedir='$(HOST_INCDIR)' \
+        -sEXPAT_INCLUDE='$(HOST_INCDIR)' \
+        -sEXPAT_LIBPATH='$(HOST_LIBDIR)' \
         stage install
 
     '$(TARGET)-g++' \
         -W -Wall -Werror -ansi -U__STRICT_ANSI__ -pedantic \
-        '$(2).cpp' -o '$(HOST_PREFIX)/bin/test-boost.exe' \
+        '$(2).cpp' -o '$(HOST_BINDIR)/test-boost.exe' \
         -DBOOST_THREAD_USE_LIB \
         -lboost_serialization-mt \
         -lboost_thread_win32-mt \