source: trunk/tools/automake/patches/000-relocatable.patch @ 31173

Last change on this file since 31173 was 31173, checked in by florian, 5 years ago

[tools] automake: update to 1.11.3

Signed-off-by: Luka Perkov <openwrt@…>

File size: 1.9 KB
  • aclocal.in

    a b eval 'case $# in 0) exec @PERL@ -S "$0"; 
    2929 
    3030BEGIN 
    3131{ 
    32   my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@-@APIVERSION@'; 
     32  my $perllibdir = $ENV{'perllibdir'} || 
     33        ($ENV{'STAGING_DIR'} ? $ENV{'STAGING_DIR'} . '/../host/share/@PACKAGE@-@APIVERSION@' : '@datadir@/@PACKAGE@-@APIVERSION@'); 
    3334  unshift @INC, (split '@PATH_SEPARATOR@', $perllibdir); 
    3435} 
    3536 
    $perl_threads = 0; 
    6162# ACLOCAL_PATH environment variable, and reset with the `--system-acdir' 
    6263# option. 
    6364my @user_includes = (); 
    64 my @automake_includes = ("@datadir@/aclocal-$APIVERSION"); 
    65 my @system_includes = ('@datadir@/aclocal'); 
     65my @automake_includes = ($ENV{'STAGING_DIR'} ? $ENV{'STAGING_DIR'} . "/../host/share/aclocal-$APIVERSION" : "@datadir@/aclocal-$APIVERSION"); 
     66my @system_includes = ($ENV{'STAGING_DIR'} ? $ENV{'STAGING_DIR'} . '/../host/share/aclocal' : '@datadir@/aclocal'); 
    6667 
    6768# Whether we should copy M4 file in $user_includes[0]. 
    6869my $install = 0; 
  • automake.in

    a b package Language; 
    3131 
    3232BEGIN 
    3333{ 
    34   my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@-@APIVERSION@'; 
     34  my $perllibdir = $ENV{'perllibdir'} ||  
     35                ($ENV{'STAGING_DIR'} ? $ENV{'STAGING_DIR'} . '/../host/share/@PACKAGE@-@APIVERSION@' : '@datadir@/@PACKAGE@-@APIVERSION@'); 
    3536  unshift @INC, (split '@PATH_SEPARATOR@', $perllibdir); 
    3637 
    3738  # Override SHELL.  This is required on DJGPP so that system() uses 
  • lib/Automake/Config.in

    a b our $APIVERSION = '@APIVERSION@'; 
    3131our $PACKAGE = '@PACKAGE@'; 
    3232our $PACKAGE_BUGREPORT = '@PACKAGE_BUGREPORT@'; 
    3333our $VERSION = '@VERSION@'; 
    34 our $libdir = '@datadir@/@PACKAGE@-@APIVERSION@'; 
     34our $libdir = $ENV{'STAGING_DIR'} ? $ENV{'STAGING_DIR'} . '/../host/share/@PACKAGE@-@APIVERSION@' : '@datadir@/@PACKAGE@-@APIVERSION@'; 
    3535our $perl_threads = @PERL_THREADS@; 
    3636 
    37371; 
Note: See TracBrowser for help on using the repository browser.