RepoMirrors/openwrt
1
0
Fork 0
mirror of git://git.openwrt.org/openwrt/openwrt.git synced 2024-12-24 15:43:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

automake: further relocation fixes

Browse Source 
SVN-Revision: 29828
This commit is contained in:
Jo-Philipp Wich 2012-01-20 15:19:22 +00:00
parent fccdc995da
commit 122069caba
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);
}
@@ -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;

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

@ -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)
{