Mercurial > mxe-octave

diff src/tinyxml.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/tinyxml.mk	Sun Jun 02 12:40:32 2013 -0400
+++ b/src/tinyxml.mk	Sun Jun 02 16:59:24 2013 -0400
@@ -19,13 +19,13 @@
     cd '$(1)' && $(TARGET)-g++ -c -O3 -Wall -Wno-unknown-pragmas -Wno-format -D TIXML_USE_STL '$(1)'/*.cpp
     cd '$(1)' && $(TARGET)-ar cr libtinyxml.a *.o
     $(TARGET)-ranlib '$(1)/libtinyxml.a'
-    $(INSTALL) -d               '$(HOST_PREFIX)/lib'
-    $(INSTALL) -m644 '$(1)'/*.a '$(HOST_PREFIX)/lib/'
-    $(INSTALL) -d               '$(HOST_PREFIX)/include'
-    $(INSTALL) -m644 '$(1)'/*.h '$(HOST_PREFIX)/include/'
+    $(INSTALL) -d               '$(HOST_LIBDIR)'
+    $(INSTALL) -m644 '$(1)'/*.a '$(HOST_LIBDIR)'
+    $(INSTALL) -d               '$(HOST_INCDIR)'
+    $(INSTALL) -m644 '$(1)'/*.h '$(HOST_INCDIR)'
 
     '$(TARGET)-g++' \
         -W -Wall -D TIXML_USE_STL -Werror -ansi -pedantic \
-        '$(2).cpp' -o '$(HOST_PREFIX)/bin/test-tinyxml.exe' \
+        '$(2).cpp' -o '$(HOST_BINDIR)/test-tinyxml.exe' \
         -ltinyxml
 endef