* src/preproc/html/pre-html.cc (TROFF_COMMAND): Removed.

(scanArguments): Use PROG_PREFIX for the name of the troff binary.

2 files changed, 13 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 4fdd74c4..d63f5239 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-12-10  Werner LEMBERG  <wl@gnu.org>
+
+	* src/preproc/html/pre-html.cc (TROFF_COMMAND): Removed.
+	(scanArguments): Use PROG_PREFIX for the name of the troff binary.
+
 2001-12-09  Werner LEMBERG  <wl@gnu.org>
 
 	* man/roff.man: Revised.
diff --git a/src/preproc/html/pre-html.cc b/src/preproc/html/pre-html.cc
index 001f9d59..4492810b 100644
--- a/src/preproc/html/pre-html.cc
+++ b/src/preproc/html/pre-html.cc
@@ -75,7 +75,6 @@ extern "C" const char *Version_string;
 #define PS_TEMPLATE_LONG "-ps-"
 #define REGION_TEMPLATE_SHORT "rg"
 #define REGION_TEMPLATE_LONG "-regions-"
-#define TROFF_COMMAND "troff"
 
 #if 0
 #   define  DEBUGGING
@@ -1202,6 +1201,12 @@ void usage(FILE *stream)
 
 int scanArguments (int argc, char **argv)
 {
+  const char *command_prefix = getenv("GROFF_COMMAND_PREFIX");
+  if (!command_prefix)
+    command_prefix = PROG_PREFIX;
+  char *troff_name = new char[strlen(command_prefix) + strlen("troff") + 1];
+  strcpy(troff_name, command_prefix);
+  strcat(troff_name, "troff");
   int c;
   static const struct option long_options[] = {
     { "help", no_argument, 0, CHAR_MAX + 1 },
@@ -1250,12 +1255,13 @@ int scanArguments (int argc, char **argv)
     }
 
   while (optind < argc) {
-    if (strcmp(argv[optind], "troff") == 0)
+    if (strcmp(argv[optind], troff_name) == 0)
       troff_arg = optind;
     else if (argv[optind][0] != '-')
       return optind;
     optind++;
   }
+  a_delete troff_name;
 
   return( argc );
 }