OpenWrt – Blame information for rev 2

Subversion Repositories:
Rev:
Rev Author Line No. Line
1 office 1 --- a/lib/Automake/Config.in
2 +++ b/lib/Automake/Config.in
3 @@ -32,7 +32,7 @@ our $PACKAGE = '@PACKAGE@';
4 our $PACKAGE_BUGREPORT = '@PACKAGE_BUGREPORT@';
5 our $VERSION = '@VERSION@';
6 our $RELEASE_YEAR = '@RELEASE_YEAR@';
7 -our $libdir = '@datadir@/@PACKAGE@-@APIVERSION@';
8 +our $libdir = $ENV{'STAGING_DIR'} ? $ENV{'STAGING_DIR'} . '/../host/share/@PACKAGE@-@APIVERSION@' : '@datadir@/@PACKAGE@-@APIVERSION@';
9  
10 our $perl_threads = 0;
11 # We need at least this version for CLONE support.
12 --- a/bin/aclocal.in
13 +++ b/bin/aclocal.in
14 @@ -1,10 +1,12 @@
15 -#!@PERL@ -w
16 +#!@PERL@
17 # -*- perl -*-
18 # @configure_input@
19  
20 eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac'
21 if 0;
22  
23 +$^W = 1;
24 +
25 # aclocal - create aclocal.m4 by scanning configure.ac
26  
27 # Copyright (C) 1996-2017 Free Software Foundation, Inc.
28 @@ -27,7 +29,7 @@ eval 'case $# in 0) exec @PERL@ -S "$0";
29  
30 BEGIN
31 {
32 - @Aclocal::perl_libdirs = ('@datadir@/@PACKAGE@-@APIVERSION@')
33 + @Aclocal::perl_libdirs = ($ENV{'STAGING_DIR'} ? $ENV{'STAGING_DIR'} . '/../host/share/@PACKAGE@-@APIVERSION@' : '@datadir@/@PACKAGE@-@APIVERSION@')
34 unless @Aclocal::perl_libdirs;
35 unshift @INC, @Aclocal::perl_libdirs;
36 }
37 @@ -69,8 +71,8 @@ $perl_threads = 0;
38 # ACLOCAL_PATH environment variable, and reset with the '--system-acdir'
39 # option.
40 my @user_includes = ();
41 -my @automake_includes = ("@datadir@/aclocal-$APIVERSION");
42 -my @system_includes = ('@datadir@/aclocal');
43 +my @automake_includes = ($ENV{'STAGING_DIR'} ? $ENV{'STAGING_DIR'} . "/../host/share/aclocal-$APIVERSION" : "@datadir@/aclocal-$APIVERSION");
44 +my @system_includes = ($ENV{'STAGING_DIR'} ? $ENV{'STAGING_DIR'} . '/../host/share/aclocal' : '@datadir@/aclocal');
45  
46 # Whether we should copy M4 file in $user_includes[0].
47 my $install = 0;
48 --- a/bin/automake.in
49 +++ b/bin/automake.in
50 @@ -1,10 +1,12 @@
51 -#!@PERL@ -w
52 +#!@PERL@
53 # -*- perl -*-
54 # @configure_input@
55  
56 eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac'
57 if 0;
58  
59 +$^W = 1;
60 +
61 # automake - create Makefile.in from Makefile.am
62 # Copyright (C) 1994-2017 Free Software Foundation, Inc.
63  
64 @@ -31,7 +33,7 @@ use strict;
65  
66 BEGIN
67 {
68 - @Automake::perl_libdirs = ('@datadir@/@PACKAGE@-@APIVERSION@')
69 + @Automake::perl_libdirs = ($ENV{'STAGING_DIR'} ? $ENV{'STAGING_DIR'} . '/../host/share/@PACKAGE@-@APIVERSION@' : '@datadir@/@PACKAGE@-@APIVERSION@')
70 unless @Automake::perl_libdirs;
71 unshift @INC, @Automake::perl_libdirs;
72  
73 --- a/t/wrap/aclocal.in
74 +++ b/t/wrap/aclocal.in
75 @@ -1,6 +1,8 @@
76 -#!@PERL@ -w
77 +#!@PERL@
78 # @configure_input@
79  
80 +$^W = 1;
81 +
82 # Copyright (C) 2012-2017 Free Software Foundation, Inc.
83  
84 # This program is free software; you can redistribute it and/or modify
85 --- a/t/wrap/automake.in
86 +++ b/t/wrap/automake.in
87 @@ -1,6 +1,8 @@
88 -#!@PERL@ -w
89 +#!@PERL@
90 # @configure_input@
91  
92 +$^W = 1;
93 +
94 # Copyright (C) 2012-2017 Free Software Foundation, Inc.
95  
96 # This program is free software; you can redistribute it and/or modify