diff options
| author | jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-01-20 15:19:22 +0000 |
|---|---|---|
| committer | jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-01-20 15:19:22 +0000 |
| commit | b8a61e62d5ccebcdcafaffc0661e45797b42f820 (patch) | |
| tree | 67f6ba0125b6445693b7bede44e34691910f93af /tools/automake | |
| parent | 0ce74d902086b6965cec0978f07f860423ce152e (diff) | |
[tools] automake: further relocation fixes
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29828 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'tools/automake')
| -rw-r--r-- | tools/automake/patches/000-relocatable.patch | 11 | ||||
| -rw-r--r-- | tools/automake/patches/100-aclocal-skip-not-existing-directories.patch | 2 |
2 files changed, 12 insertions, 1 deletions
diff --git a/tools/automake/patches/000-relocatable.patch b/tools/automake/patches/000-relocatable.patch index 36a56c00f..3255b9751 100644 --- a/tools/automake/patches/000-relocatable.patch +++ b/tools/automake/patches/000-relocatable.patch @@ -10,6 +10,17 @@ 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; diff --git a/tools/automake/patches/100-aclocal-skip-not-existing-directories.patch b/tools/automake/patches/100-aclocal-skip-not-existing-directories.patch index c049b835d..cc1f49d51 100644 --- a/tools/automake/patches/100-aclocal-skip-not-existing-directories.patch +++ b/tools/automake/patches/100-aclocal-skip-not-existing-directories.patch @@ -1,6 +1,6 @@ --- a/aclocal.in +++ b/aclocal.in -@@ -309,6 +309,12 @@ sub scan_m4_dirs ($@) +@@ -310,6 +310,12 @@ sub scan_m4_dirs ($@) foreach my $m4dir (@dirlist) { |