diff options
Diffstat (limited to 'tools/automake/patches/000-relocatable.patch')
| -rw-r--r-- | tools/automake/patches/000-relocatable.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tools/automake/patches/000-relocatable.patch b/tools/automake/patches/000-relocatable.patch index 3255b97518..827797c732 100644 --- a/tools/automake/patches/000-relocatable.patch +++ b/tools/automake/patches/000-relocatable.patch @@ -1,6 +1,6 @@ --- a/aclocal.in +++ b/aclocal.in -@@ -28,7 +28,8 @@ eval 'case $# in 0) exec @PERL@ -S "$0"; +@@ -29,7 +29,8 @@ eval 'case $# in 0) exec @PERL@ -S "$0"; BEGIN { @@ -10,9 +10,9 @@ 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. +@@ -61,8 +62,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'); @@ -35,12 +35,12 @@ # Override SHELL. This is required on DJGPP so that system() uses --- a/lib/Automake/Config.in +++ b/lib/Automake/Config.in -@@ -28,7 +28,7 @@ our @EXPORT = qw ($APIVERSION $PACKAGE $ - our $APIVERSION = '@APIVERSION@'; +@@ -31,7 +31,7 @@ our $APIVERSION = '@APIVERSION@'; our $PACKAGE = '@PACKAGE@'; + our $PACKAGE_BUGREPORT = '@PACKAGE_BUGREPORT@'; our $VERSION = '@VERSION@'; -our $libdir = '@datadir@/@PACKAGE@-@APIVERSION@'; +our $libdir = $ENV{'STAGING_DIR'} ? $ENV{'STAGING_DIR'} . '/../host/share/@PACKAGE@-@APIVERSION@' : '@datadir@/@PACKAGE@-@APIVERSION@'; our $perl_threads = @PERL_THREADS@; - 1;; + 1; |