[toolsÂ] autoconf: make bin/autoconf relocatable as well

[openwrt/svn-archive/archive.git] / tools / autoconf / patches / 000-relocatable.patch

diff --git a/tools/autoconf/patches/000-relocatable.patch b/tools/autoconf/patches/000-relocatable.patch
index c66e55eb019b810e561dc62f773cd52f4917677c..98661e20023f3a8728b823bf8317cb0c5badfdc3 100644 (file)
--- 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