From 122069cabaca3992da6cb97afd91a291970c00b8 Mon Sep 17 00:00:00 2001
From: Jo-Philipp Wich <jow@openwrt.org>
Date: Fri, 20 Jan 2012 15:19:22 +0000
Subject: [PATCH] automake: further relocation fixes
SVN-Revision: 29828
---
tools/automake/patches/000-relocatable.patch | 11 +++++++++++
.../100-aclocal-skip-not-existing-directories.patch | 2 +-
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/tools/automake/patches/000-relocatable.patch b/tools/automake/patches/000-relocatable.patch
index 36a56c00fe..3255b97518 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 c049b835d2..cc1f49d519 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)
{
--
GitLab