summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTony Theodore <tonyt@logyst.com>2015-09-29 10:25:57 (GMT)
committerTony Theodore <tonyt@logyst.com>2015-09-29 10:25:57 (GMT)
commit43d12bbe496070fd02c9ce00eaf0a290fca238a5 (patch)
tree94f77d8bdc4335c4a6b53a7c25a00f2886c2f559
parent545240eaa6b66b046e8c1857a2b12945c085bd9c (diff)
parentca9f1fa48091b9393be0572a4f8a9a97bd4826e8 (diff)
downloadmxe-43d12bbe496070fd02c9ce00eaf0a290fca238a5.zip
mxe-43d12bbe496070fd02c9ce00eaf0a290fca238a5.tar.gz
mxe-43d12bbe496070fd02c9ce00eaf0a290fca238a5.tar.bz2
Merge pull request #893 from LuaAndC/prefixed-protoc
protobuf: install prefixed protoc tool
-rw-r--r--src/protobuf.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/protobuf.mk b/src/protobuf.mk
index d3551ab..eeabc2c 100644
--- a/src/protobuf.mk
+++ b/src/protobuf.mk
@@ -22,13 +22,13 @@ define $(PKG)_BUILD
cd '$(1)' && ./configure \
--disable-shared
$(MAKE) -C '$(1)' -j '$(JOBS)'
- cp '$(1)/src/protoc' '$(1)/src/protoc_host'
+ cp '$(1)/src/protoc' '$(PREFIX)/bin/$(TARGET)-protoc'
$(MAKE) -C '$(1)' -j 1 distclean
# Second step: Build for target system.
cd '$(1)' && ./configure \
$(MXE_CONFIGURE_OPTS) \
--with-zlib \
- --with-protoc=src/protoc_host
+ --with-protoc='$(PREFIX)/bin/$(TARGET)-protoc'
$(MAKE) -C '$(1)' -j '$(JOBS)'
$(MAKE) -C '$(1)' -j 1 install