1
0

000-relocatable.patch 2.9 KB

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