diff options
author | Jo-Philipp Wich <jow@openwrt.org> | 2012-01-20 17:17:04 +0000 |
---|---|---|
committer | Jo-Philipp Wich <jow@openwrt.org> | 2012-01-20 17:17:04 +0000 |
commit | 49e9bc3169ae86ace0809668ac9134ea3eebbdd3 (patch) | |
tree | 5d5170f3fb0003e2f909e35218330c4f1ed2628f /tools | |
parent | 48a0e027885868a47408e1119b1b1636e4a2a48c (diff) | |
download | master-187ad058-49e9bc3169ae86ace0809668ac9134ea3eebbdd3.tar.gz master-187ad058-49e9bc3169ae86ace0809668ac9134ea3eebbdd3.tar.bz2 master-187ad058-49e9bc3169ae86ace0809668ac9134ea3eebbdd3.zip |
[toolsÂ] autoconf: make bin/autoconf relocatable as well
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29830 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'tools')
-rw-r--r-- | tools/autoconf/patches/000-relocatable.patch | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/tools/autoconf/patches/000-relocatable.patch b/tools/autoconf/patches/000-relocatable.patch index c66e55eb01..98661e2002 100644 --- a/tools/autoconf/patches/000-relocatable.patch +++ b/tools/autoconf/patches/000-relocatable.patch @@ -137,3 +137,18 @@ unshift @INC, $pkgdatadir; # Override SHELL. On DJGPP SHELL may not be set to a shell +--- a/bin/autoconf.as ++++ b/bin/autoconf.as +@@ -85,7 +85,11 @@ exit_missing_arg=' + # restore font-lock: ' + + # Variables. +-: ${AUTOM4TE='@bindir@/@autom4te-name@'} ++if test -n "$STAGING_DIR"; then ++ : ${AUTOM4TE="$STAGING_DIR/../host/bin/@autom4te-name@"} ++else ++ : ${AUTOM4TE='@bindir@/@autom4te-name@'} ++fi + autom4te_options= + outfile= + verbose=false |