* doc/fdl.texi: New file.

* doc/groff.texinfo: Include it.
Define and use @copying.
Starting with separating glyph, symbol, and character.

* Makefile.in (EXEEXT): Set it.
* src/*/Makefile.sub (PROG): Add $(EXEEXT) for all non-script
programs.

* src/include/nonposix.h: Define GS_NAME.
* src/preproc/html/pre-html.cc (createAllPages): Use GS_NAME.

Some preliminary changes for EMX support under OS/2.

* src/preproc/pic/main.cc (main), src/roff/groff/pipeline.c: Add
__EMX__ similar to __MSDOS__.
* src/utils/indxbib/indxbib.cc (main) [__EMX__]: Use `unlink'.

27 files changed, 37 insertions, 29 deletions

diff --git a/src/devices/grodvi/Makefile.sub b/src/devices/grodvi/Makefile.sub
index 0e5d32ca..a0dcdf17 100644
--- a/src/devices/grodvi/Makefile.sub
+++ b/src/devices/grodvi/Makefile.sub
@@ -1,4 +1,4 @@
-PROG=grodvi
+PROG=grodvi$(EXEEXT)
 MAN1=grodvi.n
 XLIBS=$(LIBDRIVER) $(LIBGROFF)
 MLIB=$(LIBM)
diff --git a/src/devices/grohtml/Makefile.sub b/src/devices/grohtml/Makefile.sub
index 10f28ce1..be1a305a 100644
--- a/src/devices/grohtml/Makefile.sub
+++ b/src/devices/grohtml/Makefile.sub
@@ -1,4 +1,4 @@
-PROG=post-grohtml
+PROG=post-grohtml$(EXEEXT)
 MAN1=grohtml.n
 XLIBS=$(LIBDRIVER) $(LIBGROFF)
 MLIB=$(LIBM)
diff --git a/src/devices/grolbp/Makefile.sub b/src/devices/grolbp/Makefile.sub
index d60008b2..d5c82aa5 100644
--- a/src/devices/grolbp/Makefile.sub
+++ b/src/devices/grolbp/Makefile.sub
@@ -1,4 +1,4 @@
-PROG=grolbp
+PROG=grolbp$(EXEEXT)
 MAN1=grolbp.n
 XLIBS=$(LIBDRIVER) $(LIBGROFF)
 MLIB=$(LIBM)
diff --git a/src/devices/grolj4/Makefile.sub b/src/devices/grolj4/Makefile.sub
index bbb0cff0..08073598 100644
--- a/src/devices/grolj4/Makefile.sub
+++ b/src/devices/grolj4/Makefile.sub
@@ -1,4 +1,4 @@
-PROG=grolj4
+PROG=grolj4$(EXEEXT)
 MAN1=grolj4.n
 XLIBS=$(LIBDRIVER) $(LIBGROFF)
 MLIB=$(LIBM)
diff --git a/src/devices/grops/Makefile.sub b/src/devices/grops/Makefile.sub
index 4182527d..dff973b5 100644
--- a/src/devices/grops/Makefile.sub
+++ b/src/devices/grops/Makefile.sub
@@ -1,4 +1,4 @@
-PROG=grops
+PROG=grops$(EXEEXT)
 MAN1=grops.n
 XLIBS=$(LIBDRIVER) $(LIBGROFF)
 MLIB=$(LIBM)
diff --git a/src/devices/grotty/Makefile.sub b/src/devices/grotty/Makefile.sub
index 91d3908c..e08d2334 100644
--- a/src/devices/grotty/Makefile.sub
+++ b/src/devices/grotty/Makefile.sub
@@ -1,4 +1,4 @@
-PROG=grotty
+PROG=grotty$(EXEEXT)
 MAN1=grotty.n
 XLIBS=$(LIBDRIVER) $(LIBGROFF)
 MLIB=$(LIBM)
diff --git a/src/include/nonposix.h b/src/include/nonposix.h
index e5e688f5..8180b672 100644
--- a/src/include/nonposix.h
+++ b/src/include/nonposix.h
@@ -135,3 +135,6 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
 #ifndef NULL_DEV
 # define NULL_DEV      "/dev/null"
 #endif
+#ifndef GS_NAME
+# define GS_NAME       "gs"
+#endif
diff --git a/src/preproc/eqn/Makefile.sub b/src/preproc/eqn/Makefile.sub
index 20421e1c..945a8425 100644
--- a/src/preproc/eqn/Makefile.sub
+++ b/src/preproc/eqn/Makefile.sub
@@ -1,4 +1,4 @@
-PROG=eqn
+PROG=eqn$(EXEEXT)
 MAN1=eqn.n neqn.n
 XLIBS=$(LIBGROFF)
 OBJS=\
diff --git a/src/preproc/grn/Makefile.sub b/src/preproc/grn/Makefile.sub
index ffa0ad20..97e34136 100644
--- a/src/preproc/grn/Makefile.sub
+++ b/src/preproc/grn/Makefile.sub
@@ -1,4 +1,4 @@
-PROG=grn
+PROG=grn$(EXEEXT)
 MAN1=grn.n
 MLIB=$(LIBM)
 XLIBS=$(LIBGROFF)
diff --git a/src/preproc/html/Makefile.sub b/src/preproc/html/Makefile.sub
index 5b14c2aa..41f3c372 100644
--- a/src/preproc/html/Makefile.sub
+++ b/src/preproc/html/Makefile.sub
@@ -1,4 +1,4 @@
-PROG=pre-grohtml
+PROG=pre-grohtml$(EXEEXT)
 # MAN1=pre-grohtml.n
 MAN1=
 XLIBS=$(LIBGROFF)
diff --git a/src/preproc/html/pre-html.cc b/src/preproc/html/pre-html.cc
index 8e63c41b..84697589 100644
--- a/src/preproc/html/pre-html.cc
+++ b/src/preproc/html/pre-html.cc
@@ -765,8 +765,9 @@ static int createAllPages (void)
   }
 
   s = make_message("echo showpage | "
-		   "gs%s %s -q -dSAFER -sDEVICE=%s -r%d %s"
+		   "%s%s %s -q -dSAFER -sDEVICE=%s -r%d %s"
 		   "-sOutputFile=%s/%%d %s -",
+		   GS_NAME,
 		   EXE_EXT,
 		   gsPaper,
 		   image_device,
diff --git a/src/preproc/pic/Makefile.sub b/src/preproc/pic/Makefile.sub
index f1e29273..ec4251f9 100644
--- a/src/preproc/pic/Makefile.sub
+++ b/src/preproc/pic/Makefile.sub
@@ -1,4 +1,4 @@
-PROG=pic
+PROG=pic$(EXEEXT)
 MAN1=pic.n
 XLIBS=$(LIBGROFF)
 MLIB=$(LIBM)
diff --git a/src/preproc/pic/main.cc b/src/preproc/pic/main.cc
index e0a1d813..124cbd55 100644
--- a/src/preproc/pic/main.cc
+++ b/src/preproc/pic/main.cc
@@ -476,7 +476,7 @@ void usage(FILE *stream)
 #endif
 }
 
-#ifdef __MSDOS__
+#if defined(__MSDOS__) || defined(__EMX__)
 static char *fix_program_name(char *arg, char *dflt)
 {
   if (!arg)
@@ -499,13 +499,13 @@ static char *fix_program_name(char *arg, char *dflt)
       *p = 'a' + (*p - 'A');
   return prog;
 }
-#endif /* __MSDOS__ */
+#endif /* __MSDOS__ || __EMX__ */
 
 int main(int argc, char **argv)
 {
-#ifdef __MSDOS__
+#if defined(__MSDOS__) || defined(__EMX__)
   argv[0] = fix_program_name(argv[0], "pic");
-#endif /* __MSDOS__ */
+#endif /* __MSDOS__ || __EMX__ */
   program_name = argv[0];
   static char stderr_buf[BUFSIZ];
   setbuf(stderr, stderr_buf);
diff --git a/src/preproc/refer/Makefile.sub b/src/preproc/refer/Makefile.sub
index 1631b5e3..5ed5ec53 100644
--- a/src/preproc/refer/Makefile.sub
+++ b/src/preproc/refer/Makefile.sub
@@ -1,4 +1,4 @@
-PROG=refer
+PROG=refer$(EXEEXT)
 MAN1=refer.n
 XLIBS=$(LIBBIB) $(LIBGROFF)
 MLIB=$(LIBM)
diff --git a/src/preproc/soelim/Makefile.sub b/src/preproc/soelim/Makefile.sub
index 77007e25..cf50df18 100644
--- a/src/preproc/soelim/Makefile.sub
+++ b/src/preproc/soelim/Makefile.sub
@@ -1,4 +1,4 @@
-PROG=soelim
+PROG=soelim$(EXEEXT)
 MAN1=soelim.n
 XLIBS=$(LIBGROFF)
 OBJS=soelim.o
diff --git a/src/preproc/tbl/Makefile.sub b/src/preproc/tbl/Makefile.sub
index 224baffc..d4c0d994 100644
--- a/src/preproc/tbl/Makefile.sub
+++ b/src/preproc/tbl/Makefile.sub
@@ -1,4 +1,4 @@
-PROG=tbl
+PROG=tbl$(EXEEXT)
 MAN1=tbl.n
 XLIBS=$(LIBGROFF)
 OBJS=\
diff --git a/src/roff/groff/Makefile.sub b/src/roff/groff/Makefile.sub
index 42ae221c..db2464c9 100644
--- a/src/roff/groff/Makefile.sub
+++ b/src/roff/groff/Makefile.sub
@@ -1,4 +1,4 @@
-PROG=groff
+PROG=groff$(EXEEXT)
 MAN1=groff.n
 XLIBS=$(LIBGROFF)
 MLIB=$(LIBM)
diff --git a/src/roff/groff/pipeline.c b/src/roff/groff/pipeline.c
index 03fda1ae..96f61db2 100644
--- a/src/roff/groff/pipeline.c
+++ b/src/roff/groff/pipeline.c
@@ -99,7 +99,8 @@ static char *i_to_a P((int));
    via temporary files...  */
 
 #if defined(__MSDOS__) \
-    || (defined(_WIN32) && !defined(_UWIN) && !defined(__CYGWIN__))
+    || (defined(_WIN32) && !defined(_UWIN) && !defined(__CYGWIN__)) \
+    || defined(__EMX__)
 
 #include <process.h>
 #include <fcntl.h>
diff --git a/src/roff/troff/Makefile.sub b/src/roff/troff/Makefile.sub
index e883959d..47e1b56e 100644
--- a/src/roff/troff/Makefile.sub
+++ b/src/roff/troff/Makefile.sub
@@ -1,4 +1,4 @@
-PROG=troff
+PROG=troff$(EXEEXT)
 MAN1=troff.n
 XLIBS=$(LIBGROFF)
 MLIB=$(LIBM)
diff --git a/src/utils/addftinfo/Makefile.sub b/src/utils/addftinfo/Makefile.sub
index 23848d54..6892a812 100644
--- a/src/utils/addftinfo/Makefile.sub
+++ b/src/utils/addftinfo/Makefile.sub
@@ -1,4 +1,4 @@
-PROG=addftinfo
+PROG=addftinfo$(EXEEXT)
 MAN1=addftinfo.n
 XLIBS=$(LIBGROFF)
 OBJS=\
diff --git a/src/utils/hpftodit/Makefile.sub b/src/utils/hpftodit/Makefile.sub
index f5ff13e4..ea6d0b59 100644
--- a/src/utils/hpftodit/Makefile.sub
+++ b/src/utils/hpftodit/Makefile.sub
@@ -1,4 +1,4 @@
-PROG=hpftodit
+PROG=hpftodit$(EXEEXT)
 MAN1=hpftodit.n
 XLIBS=$(LIBGROFF)
 MLIB=$(LIBM)
diff --git a/src/utils/indxbib/Makefile.sub b/src/utils/indxbib/Makefile.sub
index f45a7a79..057556e1 100644
--- a/src/utils/indxbib/Makefile.sub
+++ b/src/utils/indxbib/Makefile.sub
@@ -1,4 +1,4 @@
-PROG=indxbib
+PROG=indxbib$(EXEEXT)
 MAN1=indxbib.n
 XLIBS=$(LIBBIB) $(LIBGROFF)
 MLIB=$(LIBM)
diff --git a/src/utils/indxbib/indxbib.cc b/src/utils/indxbib/indxbib.cc
index 0cc6c7ce..9fced937 100644
--- a/src/utils/indxbib/indxbib.cc
+++ b/src/utils/indxbib/indxbib.cc
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-/* Copyright (C) 1989-1992, 2000, 2001 Free Software Foundation, Inc.
+/* Copyright (C) 1989-1992, 2000, 2001, 2002 Free Software Foundation, Inc.
      Written by James Clark (jjc@jclark.com)
 
 This file is part of groff.
@@ -285,6 +285,9 @@ int main(int argc, char **argv)
   strcpy(index_file, basename);
   strcat(index_file, INDEX_SUFFIX);
 #ifdef HAVE_RENAME
+#ifdef __EMX__
+  unline(index_file);
+#endif /* __EMX__ */
   if (rename(temp_index_file, index_file) < 0) {
 #ifdef __MSDOS__
     // RENAME could fail on plain MSDOS filesystems because
diff --git a/src/utils/lkbib/Makefile.sub b/src/utils/lkbib/Makefile.sub
index 8f31e10f..d9aadb75 100644
--- a/src/utils/lkbib/Makefile.sub
+++ b/src/utils/lkbib/Makefile.sub
@@ -1,4 +1,4 @@
-PROG=lkbib
+PROG=lkbib$(EXEEXT)
 MAN1=lkbib.n
 XLIBS=$(LIBBIB) $(LIBGROFF)
 MLIB=$(LIBM)
diff --git a/src/utils/lookbib/Makefile.sub b/src/utils/lookbib/Makefile.sub
index 91b14045..ae2d4716 100644
--- a/src/utils/lookbib/Makefile.sub
+++ b/src/utils/lookbib/Makefile.sub
@@ -1,4 +1,4 @@
-PROG=lookbib
+PROG=lookbib$(EXEEXT)
 MAN1=lookbib.n
 XLIBS=$(LIBBIB) $(LIBGROFF)
 MLIB=$(LIBM)
diff --git a/src/utils/pfbtops/Makefile.sub b/src/utils/pfbtops/Makefile.sub
index f731ff57..f6fa93de 100644
--- a/src/utils/pfbtops/Makefile.sub
+++ b/src/utils/pfbtops/Makefile.sub
@@ -1,4 +1,4 @@
-PROG=pfbtops
+PROG=pfbtops$(EXEEXT)
 MAN1=pfbtops.n
 OBJS=pfbtops.o
 CSRCS=$(srcdir)/pfbtops.c
diff --git a/src/utils/tfmtodit/Makefile.sub b/src/utils/tfmtodit/Makefile.sub
index 057bb3e6..c2e09ae1 100644
--- a/src/utils/tfmtodit/Makefile.sub
+++ b/src/utils/tfmtodit/Makefile.sub
@@ -1,4 +1,4 @@
-PROG=tfmtodit
+PROG=tfmtodit$(EXEEXT)
 MAN1=tfmtodit.n
 XLIBS=$(LIBGROFF)
 MLIB=$(LIBM)