X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/5dcf97eaedd50c8dc9df3f1ec85596efbaaca6f4..4b1477f8c17ff700f2c23d41db998fe5c58226ff:/tools/automake/patches/000-relocatable.patch

diff --git a/tools/automake/patches/000-relocatable.patch b/tools/automake/patches/000-relocatable.patch
index 36a56c00f..3255b9751 100644
--- a/tools/automake/patches/000-relocatable.patch
+++ b/tools/automake/patches/000-relocatable.patch
@@ -10,6 +10,17 @@
    unshift @INC, (split '@PATH_SEPARATOR@', $perllibdir);
  }
  
+@@ -57,8 +58,8 @@ $perl_threads = 0;
+ # @system_includes can be augmented with the `dirlist' file.  Also
+ # --acdir will reset both @automake_includes and @system_includes.
+ my @user_includes = ();
+-my @automake_includes = ("@datadir@/aclocal-$APIVERSION");
+-my @system_includes = ('@datadir@/aclocal');
++my @automake_includes = ($ENV{'STAGING_DIR'} ? $ENV{'STAGING_DIR'} . "/../host/share/aclocal-$APIVERSION" : "@datadir@/aclocal-$APIVERSION");
++my @system_includes = ($ENV{'STAGING_DIR'} ? $ENV{'STAGING_DIR'} . '/../host/share/aclocal' : '@datadir@/aclocal');
+ 
+ # Whether we should copy M4 file in $user_includes[0].
+ my $install = 0;
 --- a/automake.in
 +++ b/automake.in
 @@ -31,7 +31,8 @@ package Language;