| --- a/lib/Automake/Config.in |
| +++ b/lib/Automake/Config.in |
| @@ -34,7 +34,7 @@ our $PACKAGE = '@PACKAGE@'; |
| our $PACKAGE_BUGREPORT = '@PACKAGE_BUGREPORT@'; |
| our $VERSION = '@VERSION@'; |
| our $RELEASE_YEAR = '@RELEASE_YEAR@'; |
| -our $libdir = $ENV{"AUTOMAKE_LIBDIR"} || '@datadir@/@PACKAGE@-@APIVERSION@'; |
| +our $libdir = $ENV{'STAGING_DIR_HOST'} ? $ENV{'STAGING_DIR_HOST'} . '/share/@PACKAGE@-@APIVERSION@' : '@datadir@/@PACKAGE@-@APIVERSION@'; |
| |
| our $perl_threads = 0; |
| # We need at least this version for CLONE support. |
| --- a/bin/aclocal.in |
| +++ b/bin/aclocal.in |
| @@ -23,9 +23,11 @@ use 5.006; |
| use strict; |
| use warnings FATAL => 'all'; |
| |
| +$^W = 1; |
| + |
| BEGIN |
| { |
| - unshift (@INC, '@datadir@/@PACKAGE@-@APIVERSION@') |
| + unshift (@INC, ($ENV{'STAGING_DIR_HOST'} ? $ENV{'STAGING_DIR_HOST'} . '/share/@PACKAGE@-@APIVERSION@' : '@datadir@/@PACKAGE@-@APIVERSION@')) |
| unless $ENV{AUTOMAKE_UNINSTALLED}; |
| } |
| |
| @@ -65,8 +67,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_HOST'} ? $ENV{'STAGING_DIR_HOST'} . "/share/aclocal-$APIVERSION" : "@datadir@/aclocal-$APIVERSION"); |
| +my @system_includes = ($ENV{'STAGING_DIR_HOST'} ? $ENV{'STAGING_DIR_HOST'} . '/share/aclocal' : '@datadir@/aclocal'); |
| |
| # Whether we should copy M4 file in $user_includes[0]. |
| my $install = 0; |
| --- a/bin/automake.in |
| +++ b/bin/automake.in |
| @@ -26,9 +26,11 @@ use 5.006; |
| use strict; |
| use warnings FATAL => 'all'; |
| |
| +$^W = 1; |
| + |
| BEGIN |
| { |
| - unshift (@INC, '@datadir@/@PACKAGE@-@APIVERSION@') |
| + unshift (@INC, ($ENV{'STAGING_DIR_HOST'} ? $ENV{'STAGING_DIR_HOST'} . '/share/@PACKAGE@-@APIVERSION@' : '@datadir@/@PACKAGE@-@APIVERSION@')) |
| unless $ENV{AUTOMAKE_UNINSTALLED}; |
| |
| # Override SHELL. This is required on DJGPP so that system() uses |