000-relocatable.patch 1.4 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243
  1. --- a/src/files.c
  2. +++ b/src/files.c
  3. @@ -560,9 +560,9 @@ pkgdatadir (void)
  4. char const *
  5. m4path (void)
  6. {
  7. - char const *m4 = getenv ("M4");
  8. + char const *m4 = getenv ("STAGING_DIR_HOST");
  9. if (m4)
  10. - return m4;
  11. + return strcat(getenv ("STAGING_DIR_HOST"), "/bin/m4");
  12. /* We don't use relocate2() to store the temporary buffer and re-use
  13. it, because m4path() is only called once. */
  14. --- a/src/getargs.c
  15. +++ b/src/getargs.c
  16. @@ -373,11 +373,13 @@ usage (int status)
  17. A --long option is required.
  18. Otherwise, add exceptions to ../build-aux/cross-options.pl. */
  19. - printf (_("Usage: %s [OPTION]... FILE\n"), program_name);
  20. + printf (_("Usage: STAGING_DIR_HOST=... %s [OPTION]... FILE\n"), program_name);
  21. fputs (_("\
  22. Generate a deterministic LR or generalized LR (GLR) parser employing\n\
  23. LALR(1), IELR(1), or canonical LR(1) parser tables.\n\
  24. \n\
  25. +Environment Variable STAGING_DIR_HOST controls path to m4\n\
  26. +\n\
  27. "), stdout);
  28. fputs (_("\
  29. @@ -450,6 +452,11 @@ Output Files:\n\
  30. -M, --file-prefix-map=OLD=NEW replace prefix OLD with NEW when writing file paths\n\
  31. in output files\n\
  32. "), stdout);
  33. +
  34. + fputs (_("\
  35. +Environment Variables:\n\
  36. + STAGING_DIR_HOST Path to m4 is [STAGING_DIR_HOST]/bin/m4\n\
  37. +"), stdout);
  38. putc ('\n', stdout);
  39. argmatch_report_usage (stdout);