Changeset 29828


Ignore:
Timestamp:
2012-01-20T16:19:22+01:00 (6 years ago)
Author:
jow
Message:

[tools] automake: further relocation fixes

Location:
trunk/tools/automake/patches
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/tools/automake/patches/000-relocatable.patch

    r29820 r29828  
    1111 } 
    1212  
     13@@ -57,8 +58,8 @@ $perl_threads = 0; 
     14 # @system_includes can be augmented with the `dirlist' file.  Also 
     15 # --acdir will reset both @automake_includes and @system_includes. 
     16 my @user_includes = (); 
     17-my @automake_includes = ("@datadir@/aclocal-$APIVERSION"); 
     18-my @system_includes = ('@datadir@/aclocal'); 
     19+my @automake_includes = ($ENV{'STAGING_DIR'} ? $ENV{'STAGING_DIR'} . "/../host/share/aclocal-$APIVERSION" : "@datadir@/aclocal-$APIVERSION"); 
     20+my @system_includes = ($ENV{'STAGING_DIR'} ? $ENV{'STAGING_DIR'} . '/../host/share/aclocal' : '@datadir@/aclocal'); 
     21  
     22 # Whether we should copy M4 file in $user_includes[0]. 
     23 my $install = 0; 
    1324--- a/automake.in 
    1425+++ b/automake.in 
  • trunk/tools/automake/patches/100-aclocal-skip-not-existing-directories.patch

    r24427 r29828  
    11--- a/aclocal.in 
    22+++ b/aclocal.in 
    3 @@ -309,6 +309,12 @@ sub scan_m4_dirs ($@) 
     3@@ -310,6 +310,12 @@ sub scan_m4_dirs ($@) 
    44  
    55   foreach my $m4dir (@dirlist) 
Note: See TracChangeset for help on using the changeset viewer.