Openwrt/tools/automake/patches/000-relocatable.patch
Jo-Philipp Wich 122069caba automake: further relocation fixes
SVN-Revision: 29828
2012-01-20 15:19:22 +00:00

47 lines
1.9 KiB
Diff

--- a/aclocal.in
+++ b/aclocal.in
@@ -28,7 +28,8 @@ eval 'case $# in 0) exec @PERL@ -S "$0";
BEGIN
{
- my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@-@APIVERSION@';
+ my $perllibdir = $ENV{'perllibdir'} ||
+ ($ENV{'STAGING_DIR'} ? $ENV{'STAGING_DIR'} . '/../host/share/@PACKAGE@-@APIVERSION@' : '@datadir@/@PACKAGE@-@APIVERSION@');
unshift @INC, (split '@PATH_SEPARATOR@', $perllibdir);
}
@@ -57,8 +58,8 @@ $perl_threads = 0;
# @system_includes can be augmented with the `dirlist' file. Also
# --acdir will reset both @automake_includes and @system_includes.
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;
BEGIN
{
- my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@-@APIVERSION@';
+ my $perllibdir = $ENV{'perllibdir'} ||
+ ($ENV{'STAGING_DIR'} ? $ENV{'STAGING_DIR'} . '/../host/share/@PACKAGE@-@APIVERSION@' : '@datadir@/@PACKAGE@-@APIVERSION@');
unshift @INC, (split '@PATH_SEPARATOR@', $perllibdir);
# 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@';
our $PACKAGE = '@PACKAGE@';
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;;