From 05e1de380b8cb08e8a76612686a36760c4a03d9d Mon Sep 17 00:00:00 2001
From: Simon Howard <fraggle@soulsphere.org>
Date: Sun, 28 Feb 2016 18:13:11 -0500
Subject: [PATCH] Include install/bin in PATH when building for target.

This matches the existing logic for ACLOCAL_PATH, and some config
macros check for installed tools.
---
 chocpkg/chocpkg | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/chocpkg/chocpkg b/chocpkg/chocpkg
index 415a6bf..808599f 100755
--- a/chocpkg/chocpkg
+++ b/chocpkg/chocpkg
@@ -33,7 +33,7 @@ END
 basic_setup() {
     if [ -z "${CHOCPKG_ROOT:-}" ]; then
         set_chocpkg_root
-        PATH="$CHOCPKG_ROOT/chocpkg:$CHOCPKG_ROOT/install.native/bin:$PATH"
+        PATH="$CHOCPKG_ROOT/chocpkg:$PATH"
     fi
 
     INSTALL_DIR="$CHOCPKG_ROOT/install"
@@ -104,10 +104,19 @@ setup_build_environment() {
 
     # ACLOCAL_PATH is a special case: we include the aclocal paths from both
     # target and native, so that it is possible to get the pkg-config macros.
-    ACLOCAL_PATH="$INSTALL_DIR/share/aclocal:${ACLOCAL_PATH:-}"
     ACLOCAL_PATH="$NATIVE_INSTALL_DIR/share/aclocal:$ACLOCAL_PATH"
+    if [ "$PACKAGE_TYPE" = "target" ]; then
+        ACLOCAL_PATH="$INSTALL_DIR/share/aclocal:${ACLOCAL_PATH:-}"
+    fi
     export ACLOCAL_PATH
 
+    # Same with PATH as for ACLOCAL_PATH. We can always run tools from
+    # install.native, but only from target install if we're building for it.
+    PATH="$NATIVE_INSTALL_DIR/bin:$PATH"
+    if [ "$PACKAGE_TYPE" = "target" ]; then
+        PATH="$INSTALL_DIR/bin:$PATH"
+    fi
+
     # We need to find where to look for pkg-config .pc files:
     PKG_CONFIG_PATH="$PACKAGE_INSTALL_DIR/lib/pkgconfig:${PKG_CONFIG_PATH:-}"
     export PKG_CONFIG_PATH