mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-26 08:51:13 +00:00
45 lines
1.8 KiB
Diff
45 lines
1.8 KiB
Diff
--- a/lib/Automake/Config.in
|
|
+++ b/lib/Automake/Config.in
|
|
@@ -32,7 +32,7 @@ our $PACKAGE = '@PACKAGE@';
|
|
our $PACKAGE_BUGREPORT = '@PACKAGE_BUGREPORT@';
|
|
our $VERSION = '@VERSION@';
|
|
our $RELEASE_YEAR = '@RELEASE_YEAR@';
|
|
-our $libdir = '@datadir@/@PACKAGE@-@APIVERSION@';
|
|
+our $libdir = $ENV{'STAGING_DIR'} ? $ENV{'STAGING_DIR'} . '/../host/share/@PACKAGE@-@APIVERSION@' : '@datadir@/@PACKAGE@-@APIVERSION@';
|
|
|
|
our $perl_threads = 0;
|
|
# We need at least this version for CLONE support.
|
|
--- a/bin/aclocal.in
|
|
+++ b/bin/aclocal.in
|
|
@@ -27,7 +27,7 @@ eval 'case $# in 0) exec @PERL@ -S "$0";
|
|
|
|
BEGIN
|
|
{
|
|
- @Aclocal::perl_libdirs = ('@datadir@/@PACKAGE@-@APIVERSION@')
|
|
+ @Aclocal::perl_libdirs = ($ENV{'STAGING_DIR'} ? $ENV{'STAGING_DIR'} . '/../host/share/@PACKAGE@-@APIVERSION@' : '@datadir@/@PACKAGE@-@APIVERSION@')
|
|
unless @Aclocal::perl_libdirs;
|
|
unshift @INC, @Aclocal::perl_libdirs;
|
|
}
|
|
@@ -69,8 +69,8 @@ $perl_threads = 0;
|
|
# ACLOCAL_PATH environment variable, and reset with the '--system-acdir'
|
|
# option.
|
|
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/bin/automake.in
|
|
+++ b/bin/automake.in
|
|
@@ -31,7 +31,7 @@ use strict;
|
|
|
|
BEGIN
|
|
{
|
|
- @Automake::perl_libdirs = ('@datadir@/@PACKAGE@-@APIVERSION@')
|
|
+ @Automake::perl_libdirs = ($ENV{'STAGING_DIR'} ? $ENV{'STAGING_DIR'} . '/../host/share/@PACKAGE@-@APIVERSION@' : '@datadir@/@PACKAGE@-@APIVERSION@')
|
|
unless @Automake::perl_libdirs;
|
|
unshift @INC, @Automake::perl_libdirs;
|
|
|