qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-24 04:26:16 +02:00
Code

[tools] automake: further relocation fixes

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29828 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
jow 2012-01-20 15:19:22 +00:00
parent 0ce74d9020
commit b8a61e62d5
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tools/automake/patches/000-relocatable.patch
View File

@ -10,6 +10,17 @@
unshift @INC, (split '@PATH_SEPARATOR@', $perllibdir); 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 --- a/automake.in
+++ b/automake.in +++ b/automake.in
@@ -31,7 +31,8 @@ package Language; @@ -31,7 +31,8 @@ package Language;

2
tools/automake/patches/100-aclocal-skip-not-existing-directories.patch
View File

@ -1,6 +1,6 @@
--- a/aclocal.in --- a/aclocal.in
+++ b/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) foreach my $m4dir (@dirlist)
{ {