diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2012-01-20 15:19:22 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2012-01-20 15:19:22 +0000 |
| commit | 122069cabaca3992da6cb97afd91a291970c00b8 (patch) | |
| tree | 36dea1ce43a6f7ed52e6d83d46c3039a8f82cc75 | |
| parent | fccdc995da93d2bcfe5683dd24e2abdf171007ba (diff) | |
| download | upstream-122069cabaca3992da6cb97afd91a291970c00b8.tar.gz upstream-122069cabaca3992da6cb97afd91a291970c00b8.tar.bz2 upstream-122069cabaca3992da6cb97afd91a291970c00b8.zip | |
automake: further relocation fixes
SVN-Revision: 29828
| -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 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) { |