X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/5dcf97eaedd50c8dc9df3f1ec85596efbaaca6f4..HEAD:/tools/automake/patches/000-relocatable.patch?ds=sidebyside

diff --git a/tools/automake/patches/000-relocatable.patch b/tools/automake/patches/000-relocatable.patch
index 36a56c00f..827797c73 100644
--- a/tools/automake/patches/000-relocatable.patch
+++ b/tools/automake/patches/000-relocatable.patch
@@ -1,6 +1,6 @@
 --- a/aclocal.in
 +++ b/aclocal.in
-@@ -28,7 +28,8 @@ eval 'case $# in 0) exec @PERL@ -S "$0";
+@@ -29,7 +29,8 @@ eval 'case $# in 0) exec @PERL@ -S "$0";
  
  BEGIN
  {
@@ -10,6 +10,17 @@
    unshift @INC, (split '@PATH_SEPARATOR@', $perllibdir);
  }
  
+@@ -61,8 +62,8 @@ $perl_threads = 0;
+ # ACLOCAL_PATH environment variable, and reset with the `--system-acdir'
+ # option.
+ 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;
@@ -24,12 +35,12 @@
    # Override SHELL.  This is required on DJGPP so that system() uses
 --- a/lib/Automake/Config.in
 +++ b/lib/Automake/Config.in
-@@ -28,7 +28,7 @@ our @EXPORT = qw ($APIVERSION $PACKAGE $
- our $APIVERSION = '@APIVERSION@';
+@@ -31,7 +31,7 @@ our $APIVERSION = '@APIVERSION@';
  our $PACKAGE = '@PACKAGE@';
+ our $PACKAGE_BUGREPORT = '@PACKAGE_BUGREPORT@';
  our $VERSION = '@VERSION@';
 -our $libdir = '@datadir@/@PACKAGE@-@APIVERSION@';
 +our $libdir = $ENV{'STAGING_DIR'} ? $ENV{'STAGING_DIR'} . '/../host/share/@PACKAGE@-@APIVERSION@' : '@datadir@/@PACKAGE@-@APIVERSION@';
  our $perl_threads = @PERL_THREADS@;
  
- 1;;
+ 1;