diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2009-04-22 22:05:55 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2009-04-22 22:05:55 +0000 |
| commit | 3195be7429507967adf0a495df28bc0d2618d1b1 (patch) | |
| tree | 87557961215529ecd3a03b6908eb418be99df362 /tools | |
| parent | d91cdc629196db4c044e06040ba54d59427b6c03 (diff) | |
| download | upstream-3195be7429507967adf0a495df28bc0d2618d1b1.tar.gz upstream-3195be7429507967adf0a495df28bc0d2618d1b1.tar.bz2 upstream-3195be7429507967adf0a495df28bc0d2618d1b1.zip | |
clean up automake/pkg-config handling, move separate host/package variable exports to templates, fix automake path for host builds
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15339 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/automake/files/aclocal | 10 | ||||
| -rwxr-xr-x | tools/pkg-config/files/pkg-config | 2 |
2 files changed, 2 insertions, 10 deletions
diff --git a/tools/automake/files/aclocal b/tools/automake/files/aclocal index 60278e2ab0..a60df10c42 100755 --- a/tools/automake/files/aclocal +++ b/tools/automake/files/aclocal @@ -1,10 +1,2 @@ #!/usr/bin/env sh -if [ -d ${STAGING_DIR}/host/share/aclocal ]; then - aclocal_include_dirs="-I ${STAGING_DIR}/host/share/aclocal" -else - aclocal_include_dirs= -fi -if [ -d ${STAGING_DIR}/usr/share/aclocal ]; then - aclocal_include_dirs="$aclocal_include_dirs -I ${STAGING_DIR}/usr/share/aclocal" -fi -aclocal.real $aclocal_include_dirs $@ +aclocal.real $ACLOCAL_INCLUDE $@ diff --git a/tools/pkg-config/files/pkg-config b/tools/pkg-config/files/pkg-config index a3d73700f9..8e017fb45b 100755 --- a/tools/pkg-config/files/pkg-config +++ b/tools/pkg-config/files/pkg-config @@ -1,3 +1,3 @@ #!/bin/sh -pkg-config.real $@ --define-variable=prefix=${STAGING_DIR}/usr/ --define-variable=exec_prefix=${STAGING_DIR}/usr/ +pkg-config.real $@ --define-variable=prefix=${STAGING_PREFIX}/ --define-variable=exec_prefix=${STAGING_PREFIX}/ |