autoconf: make bin/autoconf relocatable as well

SVN-Revision: 29830
padavanonly · Jan 20, 2012 · e218009 · e218009
1 parent caa9e0e
commit e218009
Showing 1 changed file with 15 additions and 0 deletions.
diff --git 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