300-m4-path.patch 668 B

1234567891011121314151617181920212223
  1. --- a/src/main.c
  2. +++ b/src/main.c
  3. @@ -213,6 +213,8 @@ int main (int argc, char *argv[])
  4. void check_options (void)
  5. {
  6. + const char * staging_dir = NULL;
  7. + char * m4_staging = NULL;
  8. int i;
  9. const char * m4 = NULL;
  10. @@ -341,7 +343,10 @@ void check_options (void)
  11. /* Setup the filter chain. */
  12. output_chain = filter_create_int(NULL, filter_tee_header, headerfilename);
  13. - if ( !(m4 = getenv("M4"))) {
  14. + if ( (staging_dir = getenv("STAGING_DIR_HOST"))) {
  15. + asprintf(&m4_staging, "%s/bin/m4", staging_dir);
  16. + m4 = m4_staging;
  17. + } else if ( !(m4 = getenv("M4"))) {
  18. char *slash;
  19. m4 = M4;
  20. if ((slash = strrchr(M4, '/')) != NULL) {