tools/automake/patches/000-relocatable.patch

   1 --- a/lib/Automake/Config.in
   2 +++ b/lib/Automake/Config.in
   3 @@ -34,7 +34,7 @@ our $PACKAGE = '@PACKAGE@';
   4  our $PACKAGE_BUGREPORT = '@PACKAGE_BUGREPORT@';
   5  our $VERSION = '@VERSION@';
   6  our $RELEASE_YEAR = '@RELEASE_YEAR@';
   7 -our $libdir = $ENV{"AUTOMAKE_LIBDIR"} || '@datadir@/@PACKAGE@-@APIVERSION@';
   8 +our $libdir = $ENV{'STAGING_DIR_HOST'} ? $ENV{'STAGING_DIR_HOST'} . '/share/@PACKAGE@-@APIVERSION@' : '@datadir@/@PACKAGE@-@APIVERSION@';
   9
  10  our $perl_threads = 0;
  11  # We need at least this version for CLONE support.
  12 --- a/bin/aclocal.in
  13 +++ b/bin/aclocal.in
  14 @@ -23,9 +23,11 @@ use 5.006;
  15  use strict;
  16  use warnings FATAL => 'all';
  17
  18 +$^W = 1;
  19 +
  20  BEGIN
  21  {
  22 -  unshift (@INC, '@datadir@/@PACKAGE@-@APIVERSION@')
  23 +  unshift (@INC, ($ENV{'STAGING_DIR_HOST'} ? $ENV{'STAGING_DIR_HOST'} . '/share/@PACKAGE@-@APIVERSION@' : '@datadir@/@PACKAGE@-@APIVERSION@'))
  24      unless $ENV{AUTOMAKE_UNINSTALLED};
  25  }
  26
  27 @@ -65,8 +67,8 @@ $perl_threads = 0;
  28  # ACLOCAL_PATH environment variable, and reset with the '--system-acdir'
  29  # option.
  30  my @user_includes = ();
  31 -my @automake_includes = ('@datadir@/aclocal-' . $APIVERSION);
  32 -my @system_includes = ('@datadir@/aclocal');
  33 +my @automake_includes = ($ENV{'STAGING_DIR_HOST'} ? $ENV{'STAGING_DIR_HOST'} . "/share/aclocal-$APIVERSION" : "@datadir@/aclocal-$APIVERSION");
  34 +my @system_includes = ($ENV{'STAGING_DIR_HOST'} ? $ENV{'STAGING_DIR_HOST'} . '/share/aclocal' : '@datadir@/aclocal');
  35
  36  # Whether we should copy M4 file in $user_includes[0].
  37  my $install = 0;
  38 --- a/bin/automake.in
  39 +++ b/bin/automake.in
  40 @@ -26,9 +26,11 @@ use 5.006;
  41  use strict;
  42  use warnings FATAL => 'all';
  43
  44 +$^W = 1;
  45 +
  46  BEGIN
  47  {
  48 -  unshift (@INC, '@datadir@/@PACKAGE@-@APIVERSION@')
  49 +  unshift (@INC, ($ENV{'STAGING_DIR_HOST'} ? $ENV{'STAGING_DIR_HOST'} . '/share/@PACKAGE@-@APIVERSION@' : '@datadir@/@PACKAGE@-@APIVERSION@'))
  50      unless $ENV{AUTOMAKE_UNINSTALLED};
  51
  52    # Override SHELL.  This is required on DJGPP so that system() uses