chocolate-doom/chocpkg
0
0
Fork 0
mirror of https://github.com/chocolate-doom/chocpkg.git synced 2025-02-25 21:11:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

Include install/bin in PATH when building for target.

Browse source 
This matches the existing logic for ACLOCAL_PATH, and some config
macros check for installed tools.
This commit is contained in:
Simon Howard 2016-02-28 18:13:11 -05:00
parent 537df0751c
commit 05e1de380b
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
chocpkg/chocpkg
View file

@ -33,7 +33,7 @@ END
basic_setup() { basic_setup() {
if [ -z "${CHOCPKG_ROOT:-}" ]; then if [ -z "${CHOCPKG_ROOT:-}" ]; then
set_chocpkg_root set_chocpkg_root
PATH="$CHOCPKG_ROOT/chocpkg:$CHOCPKG_ROOT/install.native/bin:$PATH" PATH="$CHOCPKG_ROOT/chocpkg:$PATH"
fi fi
INSTALL_DIR="$CHOCPKG_ROOT/install" 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 # 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. # 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" 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 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: # We need to find where to look for pkg-config .pc files:
PKG_CONFIG_PATH="$PACKAGE_INSTALL_DIR/lib/pkgconfig:${PKG_CONFIG_PATH:-}" PKG_CONFIG_PATH="$PACKAGE_INSTALL_DIR/lib/pkgconfig:${PKG_CONFIG_PATH:-}"
export PKG_CONFIG_PATH export PKG_CONFIG_PATH