1 --- a/lib/Automake/Config.in
2 +++ b/lib/Automake/Config.in
3 @@ -32,7 +32,7 @@ our $PACKAGE = '@PACKAGE@';
4 our $PACKAGE_BUGREPORT = '@PACKAGE_BUGREPORT@';
5 our $VERSION = '@VERSION@';
6 our $RELEASE_YEAR = '@RELEASE_YEAR@';
7 -our $libdir = '@datadir@/@PACKAGE@-@APIVERSION@';
8 +our $libdir = $ENV{'STAGING_DIR'} ? $ENV{'STAGING_DIR'} . '/../host/share/@PACKAGE@-@APIVERSION@' : '@datadir@/@PACKAGE@-@APIVERSION@';
10 our $perl_threads = 0;
11 # We need at least this version for CLONE support.
20 eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac'
25 # aclocal - create aclocal.m4 by scanning configure.ac
27 # Copyright (C) 1996-2014 Free Software Foundation, Inc.
28 @@ -27,7 +29,7 @@ eval 'case $# in 0) exec @PERL@ -S "$0";
32 - @Aclocal::perl_libdirs = ('@datadir@/@PACKAGE@-@APIVERSION@')
33 + @Aclocal::perl_libdirs = ($ENV{'STAGING_DIR'} ? $ENV{'STAGING_DIR'} . '/../host/share/@PACKAGE@-@APIVERSION@' : '@datadir@/@PACKAGE@-@APIVERSION@')
34 unless @Aclocal::perl_libdirs;
35 unshift @INC, @Aclocal::perl_libdirs;
37 @@ -69,8 +71,8 @@ $perl_threads = 0;
38 # ACLOCAL_PATH environment variable, and reset with the '--system-acdir'
40 my @user_includes = ();
41 -my @automake_includes = ("@datadir@/aclocal-$APIVERSION");
42 -my @system_includes = ('@datadir@/aclocal');
43 +my @automake_includes = ($ENV{'STAGING_DIR'} ? $ENV{'STAGING_DIR'} . "/../host/share/aclocal-$APIVERSION" : "@datadir@/aclocal-$APIVERSION");
44 +my @system_includes = ($ENV{'STAGING_DIR'} ? $ENV{'STAGING_DIR'} . '/../host/share/aclocal' : '@datadir@/aclocal');
46 # Whether we should copy M4 file in $user_includes[0].
56 eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac'
61 # automake - create Makefile.in from Makefile.am
62 # Copyright (C) 1994-2014 Free Software Foundation, Inc.
64 @@ -31,7 +33,7 @@ use strict;
68 - @Automake::perl_libdirs = ('@datadir@/@PACKAGE@-@APIVERSION@')
69 + @Automake::perl_libdirs = ($ENV{'STAGING_DIR'} ? $ENV{'STAGING_DIR'} . '/../host/share/@PACKAGE@-@APIVERSION@' : '@datadir@/@PACKAGE@-@APIVERSION@')
70 unless @Automake::perl_libdirs;
71 unshift @INC, @Automake::perl_libdirs;
73 --- a/t/wrap/aclocal.in
74 +++ b/t/wrap/aclocal.in
82 # Copyright (C) 2012-2014 Free Software Foundation, Inc.
84 # This program is free software; you can redistribute it and/or modify
85 --- a/t/wrap/automake.in
86 +++ b/t/wrap/automake.in
94 # Copyright (C) 2012-2014 Free Software Foundation, Inc.
96 # This program is free software; you can redistribute it and/or modify