Merge pull request #893 from LuaAndC/prefixed-protoc

protobuf: install prefixed protoc tool
9 years ago · 43d12bbe49
parent 545240eaa6 ca9f1fa480
commit 43d12bbe49
1 changed files with 2 additions and 2 deletions
--- 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