* src/roff/troff/glyphuni.cpp, src/roff/troff/unicode.cpp,

src/roff/troff/unicode.h, src/roff/troff/uniglyph.cpp,
src/roff/troff/uniuni.cpp: Moved to...
* src/libs/libgroff/glyphuni.cpp, src/libs/libgroff/unicode.cpp,
src/libs/libgroff/unicode.h, src/libs/libgroff/uniglyph.cpp,
src/libs/libgroff/uniuni.cpp: Here.

* src/include/Makefile.sub.old (HDRS),
src/libs/libgroff/Makefile.sub (OBJS, CCSRCS),
src/roff/troff/Makefile.sub (HDRS, PBJS, CCSRCS): Updated.

9 files changed, 50 insertions, 31 deletions

diff --git a/src/include/Makefile.sub b/src/include/Makefile.sub
index 620d3453..ef9c4648 100644
--- a/src/include/Makefile.sub
+++ b/src/include/Makefile.sub
@@ -22,7 +22,8 @@ HDRS=\
   refid.h \
   search.h \
   searchpath.h \
-  stringclass.h
+  stringclass.h \
+  unicode.h
 GENHDRS=defs.h
 
 all depend: $(GENHDRS)
diff --git a/src/roff/troff/unicode.h b/src/include/unicode.h
index 846a70ec..846a70ec 100644
--- a/src/roff/troff/unicode.h
+++ b/src/include/unicode.h
diff --git a/src/libs/libgroff/Makefile.sub b/src/libs/libgroff/Makefile.sub
index 30277ab5..51eb84ab 100644
--- a/src/libs/libgroff/Makefile.sub
+++ b/src/libs/libgroff/Makefile.sub
@@ -15,11 +15,15 @@ OBJS=\
   geometry.$(OBJEXT) \
   getopt.$(OBJEXT) \
   getopt1.$(OBJEXT) \
+  glyphuni.$(OBJEXT) \
   htmlhint.$(OBJEXT) \
+  iftoa.$(OBJEXT) \
   invalid.$(OBJEXT) \
+  itoa.$(OBJEXT) \
   lf.$(OBJEXT) \
   lineno.$(OBJEXT) \
   macropath.$(OBJEXT) \
+  matherr.$(OBJEXT) \
   maxfilename.$(OBJEXT) \
   mksdir.$(OBJEXT) \
   nametoindex.$(OBJEXT) \
@@ -33,9 +37,9 @@ OBJS=\
   strsave.$(OBJEXT) \
   tmpfile.$(OBJEXT) \
   tmpname.$(OBJEXT) \
-  iftoa.$(OBJEXT) \
-  itoa.$(OBJEXT) \
-  matherr.$(OBJEXT) \
+  unicode.$(OBJEXT) \
+  uniglyph.$(OBJEXT) \
+  uniuni.$(OBJEXT) \
   version.$(OBJEXT) \
   $(LIBOBJS)
 CCSRCS=\
@@ -52,6 +56,7 @@ CCSRCS=\
   $(srcdir)/font.cpp \
   $(srcdir)/fontfile.cpp \
   $(srcdir)/geometry.cpp \
+  $(srcdir)/glyphuni.cpp \
   $(srcdir)/htmlhint.cpp \
   $(srcdir)/invalid.cpp \
   $(srcdir)/lf.cpp \
@@ -71,6 +76,9 @@ CCSRCS=\
   $(srcdir)/strsave.cpp \
   $(srcdir)/tmpfile.cpp \
   $(srcdir)/tmpname.cpp \
+  $(srcdir)/unicode.cpp \
+  $(srcdir)/uniglyph.cpp \
+  $(srcdir)/uniuni.cpp \
   version.cpp
 CSRCS=\
   $(srcdir)/fmod.c \
diff --git a/src/roff/troff/glyphuni.cpp b/src/libs/libgroff/glyphuni.cpp
index 7e242ce2..7e242ce2 100644
--- a/src/roff/troff/glyphuni.cpp
+++ b/src/libs/libgroff/glyphuni.cpp
diff --git a/src/roff/troff/unicode.cpp b/src/libs/libgroff/unicode.cpp
index 21174634..21174634 100644
--- a/src/roff/troff/unicode.cpp
+++ b/src/libs/libgroff/unicode.cpp
diff --git a/src/roff/troff/uniglyph.cpp b/src/libs/libgroff/uniglyph.cpp
index 3428605c..3428605c 100644
--- a/src/roff/troff/uniglyph.cpp
+++ b/src/libs/libgroff/uniglyph.cpp
diff --git a/src/roff/troff/uniuni.cpp b/src/libs/libgroff/uniuni.cpp
index 3f4baa42..3f4baa42 100644
--- a/src/roff/troff/uniuni.cpp
+++ b/src/libs/libgroff/uniuni.cpp
diff --git a/src/preproc/html/pre-html.cpp b/src/preproc/html/pre-html.cpp
index 0fa925e5..595ded13 100644
--- a/src/preproc/html/pre-html.cpp
+++ b/src/preproc/html/pre-html.cpp
@@ -56,7 +56,6 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
 /* Establish some definitions to facilitate discrimination between
    differing runtime environments. */
 
-#undef __tmpfile
 #undef MAY_FORK_CHILD_PROCESS
 #undef MAY_SPAWN_ASYNCHRONOUS_CHILD
 
@@ -79,10 +78,22 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
 #  define MAY_SPAWN_ASYNCHRONOUS_CHILD 0
 # endif /* not defined __CYGWIN__, _UWIN, or __MINGW32__ */
 
-/* MS-DOS and Win32 will probably not have `/tmp' on all disk drives,
-   but we can normally expect to be able to use `c:/temp' for temporary
-   files. */
-# define __tmpfile "c:/temp/"
+# if defined(DEBUGGING) && !defined(DEBUG_FILE)
+/* When we are building a DEBUGGING version we need to tell pre-grohtml
+   where to put intermediate files (the DEBUGGING version will preserve
+   these on exit).
+
+   On a UNIX host, we might simply use `/tmp', but MS-DOS and Win32 will
+   probably not have this on all disk drives, so default to using
+   `c:/temp' instead.  (Note that user may choose to override this by
+   supplying a definition such as
+
+     -DDEBUG_FILE="d:/path/to/debug/files/"
+
+   in the CPPFLAGS to `make'.  If overriding in this manner, the trailing
+   `/' MUST be included in the definition.) */
+#  define DEBUG_FILE "c:/temp/"
+# endif
 
 #else /* not __MSDOS__ or _WIN32 */
 
@@ -91,9 +102,17 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
 # define MAY_FORK_CHILD_PROCESS 1
 # define MAY_SPAWN_ASYNCHRONOUS_CHILD 1
 
-/* We can also usually rely on being able to use `/tmp' for temporary
-   file storage. */
-# define __tmpfile "/tmp/"
+# if defined(DEBUGGING) && !defined(DEBUG_FILE)
+/* For a DEBUGGING version, on the UNIX host, we can also usually rely
+   on being able to use `/tmp' for temporary file storage.  (Note that,
+   as in the __MSDOS__ or _WIN32 case above, the user may override this
+   by defining
+
+     -DDEBUG_FILE="/path/to/debug/files/"
+
+   in the CPPFLAGS, again noting that the trailing `/' is REQUIRED.) */
+#  define DEBUG_FILE "/tmp/"
+# endif
 #endif /* not __MSDOS__ or _WIN32 */
 
 extern "C" const char *Version_string;
@@ -1566,12 +1585,12 @@ static int scanArguments(int argc, char **argv)
 static int makeTempFiles(void)
 {
 #if defined(DEBUGGING)
-  psFileName = __tmpfile"prehtml-ps";
-  regionFileName = __tmpfile"prehtml-region";
-  imagePageName = __tmpfile"prehtml-page";
-  psPageName = __tmpfile"prehtml-psn";
-  troffFileName = __tmpfile"prehtml-troff";
-  htmlFileName = __tmpfile"prehtml-html";
+  psFileName = DEBUG_FILE"prehtml-ps";
+  regionFileName = DEBUG_FILE"prehtml-region";
+  imagePageName = DEBUG_FILE"prehtml-page";
+  psPageName = DEBUG_FILE"prehtml-psn";
+  troffFileName = DEBUG_FILE"prehtml-troff";
+  htmlFileName = DEBUG_FILE"prehtml-html";
 #else /* not DEBUGGING */
   FILE *f;
 
@@ -1631,7 +1650,7 @@ int main(int argc, char **argv)
   fprintf(stderr, "%s: invoked with %d arguments ...\n", argv[0], argc);
   for (i = 0; i < argc; i++)
     fprintf(stderr, "%2d: %s\n", i, argv[i]);
-  if ((dump = fopen(__tmpfile"pre-html-data", "wb")) != NULL) {
+  if ((dump = fopen(DEBUG_FILE"pre-html-data", "wb")) != NULL) {
     while((i = fgetc(stdin)) >= 0)
       fputc(i, dump);
     fclose(dump);
diff --git a/src/roff/troff/Makefile.sub b/src/roff/troff/Makefile.sub
index 7fa80247..7ecf154f 100644
--- a/src/roff/troff/Makefile.sub
+++ b/src/roff/troff/Makefile.sub
@@ -6,30 +6,22 @@ OBJS=\
   dictionary.$(OBJEXT) \
   div.$(OBJEXT) \
   env.$(OBJEXT) \
-  glyphuni.$(OBJEXT) \
   input.$(OBJEXT) \
   majorminor.$(OBJEXT) \
   node.$(OBJEXT) \
   number.$(OBJEXT) \
   reg.$(OBJEXT) \
-  symbol.$(OBJEXT) \
-  unicode.$(OBJEXT) \
-  uniglyph.$(OBJEXT) \
-  uniuni.$(OBJEXT)
+  symbol.$(OBJEXT)
 CCSRCS=\
   $(srcdir)/dictionary.cpp \
   $(srcdir)/div.cpp \
   $(srcdir)/env.cpp \
-  $(srcdir)/glyphuni.cpp \
   $(srcdir)/input.cpp \
   majorminor.cpp \
   $(srcdir)/node.cpp \
   $(srcdir)/number.cpp \
   $(srcdir)/reg.cpp \
-  $(srcdir)/symbol.cpp \
-  $(srcdir)/unicode.cpp \
-  $(srcdir)/uniglyph.cpp \
-  $(srcdir)/uniuni.cpp
+  $(srcdir)/symbol.cpp
 HDRS=\
   $(srcdir)/charinfo.h \
   $(srcdir)/dictionary.h \
@@ -42,8 +34,7 @@ HDRS=\
   $(srcdir)/request.h \
   $(srcdir)/symbol.h \
   $(srcdir)/token.h \
-  $(srcdir)/troff.h \
-  $(srcdir)/unicode.h
+  $(srcdir)/troff.h
 GENSRCS=majorminor.cpp
 NAMEPREFIX=$(g)