2015-01-09 14:51:23 +00:00
|
|
|
--- a/lib/Automake/Config.in
|
|
|
|
+++ b/lib/Automake/Config.in
|
2022-08-01 12:30:43 +00:00
|
|
|
@@ -34,7 +34,7 @@ our $PACKAGE = '@PACKAGE@';
|
2015-01-09 14:51:23 +00:00
|
|
|
our $PACKAGE_BUGREPORT = '@PACKAGE_BUGREPORT@';
|
|
|
|
our $VERSION = '@VERSION@';
|
|
|
|
our $RELEASE_YEAR = '@RELEASE_YEAR@';
|
2022-08-01 12:30:43 +00:00
|
|
|
-our $libdir = $ENV{"AUTOMAKE_LIBDIR"} || '@datadir@/@PACKAGE@-@APIVERSION@';
|
2022-11-10 16:44:13 +00:00
|
|
|
+our $libdir = $ENV{'STAGING_DIR_HOST'} ? $ENV{'STAGING_DIR_HOST'} . '/share/@PACKAGE@-@APIVERSION@' : '@datadir@/@PACKAGE@-@APIVERSION@';
|
2015-01-09 14:51:23 +00:00
|
|
|
|
|
|
|
our $perl_threads = 0;
|
|
|
|
# We need at least this version for CLONE support.
|
|
|
|
--- a/bin/aclocal.in
|
|
|
|
+++ b/bin/aclocal.in
|
2022-08-01 12:30:43 +00:00
|
|
|
@@ -23,9 +23,11 @@ use 5.006;
|
|
|
|
use strict;
|
|
|
|
use warnings FATAL => 'all';
|
2015-03-24 13:13:01 +00:00
|
|
|
|
|
|
|
+$^W = 1;
|
|
|
|
+
|
2012-01-20 02:55:55 +00:00
|
|
|
BEGIN
|
|
|
|
{
|
2022-08-01 12:30:43 +00:00
|
|
|
- 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};
|
2012-01-20 02:55:55 +00:00
|
|
|
}
|
2022-08-01 12:30:43 +00:00
|
|
|
|
|
|
|
@@ -65,8 +67,8 @@ $perl_threads = 0;
|
2015-01-09 14:51:23 +00:00
|
|
|
# ACLOCAL_PATH environment variable, and reset with the '--system-acdir'
|
2012-04-02 16:25:28 +00:00
|
|
|
# option.
|
2012-01-20 15:19:22 +00:00
|
|
|
my @user_includes = ();
|
2022-08-01 12:30:43 +00:00
|
|
|
-my @automake_includes = ('@datadir@/aclocal-' . $APIVERSION);
|
2012-01-20 15:19:22 +00:00
|
|
|
-my @system_includes = ('@datadir@/aclocal');
|
2022-11-10 16:44:13 +00:00
|
|
|
+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');
|
2012-01-20 15:19:22 +00:00
|
|
|
|
|
|
|
# Whether we should copy M4 file in $user_includes[0].
|
|
|
|
my $install = 0;
|
2015-01-09 14:51:23 +00:00
|
|
|
--- a/bin/automake.in
|
|
|
|
+++ b/bin/automake.in
|
2022-08-01 12:30:43 +00:00
|
|
|
@@ -26,9 +26,11 @@ use 5.006;
|
|
|
|
use strict;
|
|
|
|
use warnings FATAL => 'all';
|
2015-03-24 13:13:01 +00:00
|
|
|
|
|
|
|
+$^W = 1;
|
|
|
|
+
|
2012-01-20 02:55:55 +00:00
|
|
|
BEGIN
|
|
|
|
{
|
2022-08-01 12:30:43 +00:00
|
|
|
- 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};
|
2015-03-24 13:13:01 +00:00
|
|
|
|
2022-08-01 12:30:43 +00:00
|
|
|
# Override SHELL. This is required on DJGPP so that system() uses
|