1
0

000-relocatable.patch 1.9 KB

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