000-relocatable.patch 1.9 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152
  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 = $ENV{"AUTOMAKE_LIBDIR"} || '@datadir@/@PACKAGE@-@APIVERSION@';
  8. +our $libdir = $ENV{'STAGING_DIR_HOST'} ? $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. @@ -21,9 +21,11 @@
  14. use 5.006; use strict; use warnings;
  15. +$^W = 1;
  16. +
  17. BEGIN
  18. {
  19. - unshift (@INC, '@datadir@/@PACKAGE@-@APIVERSION@')
  20. + unshift (@INC, ($ENV{'STAGING_DIR_HOST'} ? $ENV{'STAGING_DIR_HOST'} . '/share/@PACKAGE@-@APIVERSION@' : '@datadir@/@PACKAGE@-@APIVERSION@'))
  21. unless $ENV{AUTOMAKE_UNINSTALLED};
  22. }
  23. @@ -63,8 +65,8 @@ $perl_threads = 0;
  24. # --aclocal-path option/ACLOCAL_PATH environment variable, and reset
  25. # with the '--system-acdir' option.
  26. my @user_includes = ();
  27. -my @automake_includes = ('@datadir@/aclocal-' . $APIVERSION);
  28. -my @system_includes = ('@datadir@/aclocal');
  29. +my @automake_includes = ($ENV{'STAGING_DIR_HOST'} ? $ENV{'STAGING_DIR_HOST'} . "/share/aclocal-$APIVERSION" : "@datadir@/aclocal-$APIVERSION");
  30. +my @system_includes = ($ENV{'STAGING_DIR_HOST'} ? $ENV{'STAGING_DIR_HOST'} . '/share/aclocal' : '@datadir@/aclocal');
  31. my $aclocal_path = '';
  32. # Whether we should copy M4 file in $user_includes[0].
  33. --- a/bin/automake.in
  34. +++ b/bin/automake.in
  35. @@ -24,9 +24,11 @@ package Automake;
  36. use 5.006; use strict; use warnings;
  37. +$^W = 1;
  38. +
  39. BEGIN
  40. {
  41. - unshift (@INC, '@datadir@/@PACKAGE@-@APIVERSION@')
  42. + unshift (@INC, ($ENV{'STAGING_DIR_HOST'} ? $ENV{'STAGING_DIR_HOST'} . '/share/@PACKAGE@-@APIVERSION@' : '@datadir@/@PACKAGE@-@APIVERSION@'))
  43. unless $ENV{AUTOMAKE_UNINSTALLED};
  44. # Override SHELL. This is required on DJGPP so that system() uses