aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2012-01-20 17:17:04 +0000
committerJo-Philipp Wich <jow@openwrt.org>2012-01-20 17:17:04 +0000
commite2180091d9349ee8ca2d2812a9380e534311e46e (patch)
tree53342d9defabd5e4153af49ae2294b6afe25bb3c
parentcaa9e0e0f36b9c406375ae05d7a8fe9c850df51f (diff)
downloadupstream-e2180091d9349ee8ca2d2812a9380e534311e46e.tar.gz
upstream-e2180091d9349ee8ca2d2812a9380e534311e46e.tar.bz2
upstream-e2180091d9349ee8ca2d2812a9380e534311e46e.zip
autoconf: make bin/autoconf relocatable as well
SVN-Revision: 29830
-rw-r--r--tools/autoconf/patches/000-relocatable.patch15
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