diff src/tinyxml.mk @ 3012:100e618349f7

Improve handling of prefix directories by defining HOST_PREFIX and BUILD_TOOLS_PREFIX variables in top-level Makefile.
author John W. Eaton <jwe@octave.org>
date Sun, 02 Jun 2013 10:31:04 -0400
parents 4d0f3a9da57e
children b6c7244a2f66
line wrap: on
line diff
--- a/src/tinyxml.mk	Sat Jun 01 20:52:09 2013 -0400
+++ b/src/tinyxml.mk	Sun Jun 02 10:31:04 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               '$(PREFIX)/$(TARGET)/lib'
-    $(INSTALL) -m644 '$(1)'/*.a '$(PREFIX)/$(TARGET)/lib/'
-    $(INSTALL) -d               '$(PREFIX)/$(TARGET)/include'
-    $(INSTALL) -m644 '$(1)'/*.h '$(PREFIX)/$(TARGET)/include/'
+    $(INSTALL) -d               '$(HOST_PREFIX)/lib'
+    $(INSTALL) -m644 '$(1)'/*.a '$(HOST_PREFIX)/lib/'
+    $(INSTALL) -d               '$(HOST_PREFIX)/include'
+    $(INSTALL) -m644 '$(1)'/*.h '$(HOST_PREFIX)/include/'
 
     '$(TARGET)-g++' \
         -W -Wall -D TIXML_USE_STL -Werror -ansi -pedantic \
-        '$(2).cpp' -o '$(PREFIX)/$(TARGET)/bin/test-tinyxml.exe' \
+        '$(2).cpp' -o '$(HOST_PREFIX)/bin/test-tinyxml.exe' \
         -ltinyxml
 endef