Mercurial > mxe-octave

diff src/protobuf.mk @ 3012:100e618349f7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 47558e958113
children bcc26ffe9a0f
line wrap: on
line diff
--- a/src/protobuf.mk	Sat Jun 01 20:52:09 2013 -0400
+++ b/src/protobuf.mk	Sun Jun 02 10:31:04 2013 -0400
@@ -25,7 +25,7 @@
 # Second step: Build for target system.
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
-        --prefix='$(PREFIX)/$(TARGET)' \
+        --prefix='$(HOST_PREFIX)' \
         $(ENABLE_SHARED_OR_STATIC) \
         --with-zlib \
         --with-protoc=src/protoc_host
@@ -34,6 +34,6 @@
 
     '$(TARGET)-g++' \
         -W -Wall -Werror -ansi -pedantic \
-        '$(2).cpp' -o '$(PREFIX)/$(TARGET)/bin/test-protobuf.exe' \
+        '$(2).cpp' -o '$(HOST_PREFIX)/bin/test-protobuf.exe' \
         `'$(TARGET)-pkg-config' protobuf --cflags --libs`
 endef