home
***
CD-ROM
|
disk
|
FTP
|
other
***
search
/
OS/2 Shareware BBS: 22 gnu
/
22-gnu.zip
/
gnugroff.zip
/
patches.os2
next >
Wrap
Text File
|
1996-05-05
|
28KB
|
1,028 lines
Only in src: spooler/
Only in src: devcp437/
Only in src: devcp850/
Only in src: Makefile
Only in src/include: defs.h
Only in src/libgroff: execpath.c
Only in src/libgroff: version.cc
Only in src/troff: majorminor.cc
diff -cbr orig/addftinfo/Makefile.sub src/addftinfo/Makefile.sub
*** orig/addftinfo/Makefile.sub Tue Jul 21 16:20:04 1992
--- src/addftinfo/Makefile.sub Sun Jan 02 18:01:04 1994
***************
*** 1,4 ****
! PROG=addftinfo
MAN1=addftinfo.n
XLIBS=$(LIBGROFF)
OBJS=addftinfo.o guess.o
--- 1,4 ----
! PROG=addftinfo$X
MAN1=addftinfo.n
XLIBS=$(LIBGROFF)
OBJS=addftinfo.o guess.o
diff -cbr orig/afmtodit/Makefile.sub src/afmtodit/Makefile.sub
*** orig/afmtodit/Makefile.sub Wed Oct 28 13:48:22 1992
--- src/afmtodit/Makefile.sub Sun May 05 00:20:12 1996
***************
*** 1,7 ****
MAN1=afmtodit.n
CLEANADD=afmtodit
! all: afmtodit
afmtodit: afmtodit.pl
if test -n "$(PERLPATH)"; then \
--- 1,7 ----
MAN1=afmtodit.n
CLEANADD=afmtodit
! # all: afmtodit
afmtodit: afmtodit.pl
if test -n "$(PERLPATH)"; then \
diff -cbr orig/eqn/Makefile.sub src/eqn/Makefile.sub
*** orig/eqn/Makefile.sub Mon Apr 19 09:47:10 1993
--- src/eqn/Makefile.sub Wed May 01 19:26:30 1996
***************
*** 1,4 ****
! PROG=eqn
MAN1=eqn.n
XLIBS=$(LIBGROFF)
OBJS=eqn.o main.o lex.o box.o limit.o list.o over.o text.o script.o \
--- 1,4 ----
! PROG=eqn$X
MAN1=eqn.n
XLIBS=$(LIBGROFF)
OBJS=eqn.o main.o lex.o box.o limit.o list.o over.o text.o script.o \
***************
*** 16,22 ****
neqn: neqn.sh
-rm -f neqn
! sed -e 's/@g@/$(g)/g' -e "$(SH_SCRIPT_SED_CMD)" $(srcdir)/neqn.sh >neqn
chmod +x neqn
install_data: neqn
--- 16,22 ----
neqn: neqn.sh
-rm -f neqn
! sed -e "s/@g@/$(g)/g" -e "$(SH_SCRIPT_SED_CMD)" $(srcdir)/neqn.sh >neqn
chmod +x neqn
install_data: neqn
diff -cbr orig/grodvi/dvi.cc src/grodvi/dvi.cc
*** orig/grodvi/dvi.cc Thu Jun 22 08:42:00 1995
--- src/grodvi/dvi.cc Wed May 01 19:40:16 1996
***************
*** 849,854 ****
--- 849,857 ----
program_name = argv[0];
static char stderr_buf[BUFSIZ];
setbuf(stderr, stderr_buf);
+ #ifdef __EMX__
+ setmode(1, O_BINARY);
+ #endif
int c;
while ((c = getopt(argc, argv, "F:vw:d")) != EOF)
switch(c) {
diff -cbr orig/grodvi/Makefile.sub src/grodvi/Makefile.sub
*** orig/grodvi/Makefile.sub Mon Jul 20 13:51:36 1992
--- src/grodvi/Makefile.sub Sun Jan 02 18:00:40 1994
***************
*** 1,4 ****
! PROG=grodvi
MAN1=grodvi.n
XLIBS=$(LIBDRIVER) $(LIBGROFF)
MLIB=$(LIBM)
--- 1,4 ----
! PROG=grodvi$X
MAN1=grodvi.n
XLIBS=$(LIBDRIVER) $(LIBGROFF)
MLIB=$(LIBM)
diff -cbr orig/groff/groff.cc src/groff/groff.cc
*** orig/groff/groff.cc Thu Jun 22 09:08:00 1995
--- src/groff/groff.cc Wed May 01 19:43:24 1996
***************
*** 50,55 ****
--- 50,59 ----
}
#endif /* not STDLIB_H_DECLARES_PUTENV */
+ #ifdef __EMX__
+ #include <io.h>
+ #endif
+
const int SOELIM_INDEX = 0;
const int REFER_INDEX = SOELIM_INDEX + 1;
const int PIC_INDEX = REFER_INDEX + 1;
***************
*** 111,116 ****
--- 115,126 ----
const char *command_prefix = getenv("GROFF_COMMAND_PREFIX");
if (!command_prefix)
command_prefix = PROG_PREFIX;
+ #ifdef __EMX__
+ _response(&argc, &argv);
+ _wildcard(&argc, &argv);
+ if (isatty(0) && argc == 1)
+ help();
+ #endif
commands[TROFF_INDEX].set_name(command_prefix, "troff");
while ((opt = getopt(argc, argv,
"itpeRsSzavVhblCENXZF:m:T:f:w:W:M:d:r:n:o:P:L:"))
***************
*** 154,159 ****
--- 164,170 ----
case 'v':
case 'C':
commands[SOELIM_INDEX].append_arg(buf);
+ commands[REFER_INDEX].append_arg(buf);
commands[PIC_INDEX].append_arg(buf);
commands[TBL_INDEX].append_arg(buf);
commands[EQN_INDEX].append_arg(buf);
***************
*** 271,278 ****
--- 282,294 ----
if (gxditview_flag)
commands[POST_INDEX].append_arg("-");
if (lflag && !Xflag && spooler) {
+ #ifdef __EMX__
+ commands[SPOOL_INDEX].set_name(getenv("OS2_SHELL"));
+ commands[SPOOL_INDEX].append_arg("/c");
+ #else
commands[SPOOL_INDEX].set_name(BSHELL);
commands[SPOOL_INDEX].append_arg("-c");
+ #endif
Largs += '\0';
Largs = spooler + Largs;
commands[SPOOL_INDEX].append_arg(Largs.contents());
***************
*** 533,540 ****
void synopsis()
{
fprintf(stderr,
! "usage: %s [-abehilpstvzCENRSVXZ] [-Fdir] [-mname] [-Tdev] [-ffam] [-wname]\n"
" [-Wname] [ -Mdir] [-dcs] [-rcn] [-nnum] [-olist] [-Parg] [-Larg]\n"
" [files...]\n",
program_name);
--- 549,558 ----
void synopsis()
{
+ extern const char *version_string;
+ fprintf(stderr, "\nGNU groff %s\n\n", version_string);
fprintf(stderr,
! "Usage: %s [-abehilpstvzCENRSVXZ] [-Fdir] [-mname] [-Tdev] [-ffam] [-wname]\n"
" [-Wname] [ -Mdir] [-dcs] [-rcn] [-nnum] [-olist] [-Parg] [-Larg]\n"
" [files...]\n",
program_name);
diff -cbr orig/groff/Makefile.sub src/groff/Makefile.sub
*** orig/groff/Makefile.sub Fri Aug 07 15:08:04 1992
--- src/groff/Makefile.sub Sun Jan 02 17:58:46 1994
***************
*** 1,4 ****
! PROG=groff
MAN1=groff.n
XLIBS=$(LIBGROFF)
MLIB=$(LIBM)
--- 1,4 ----
! PROG=groff$X
MAN1=groff.n
XLIBS=$(LIBGROFF)
MLIB=$(LIBM)
diff -cbr orig/groff/pipeline.c src/groff/pipeline.c
*** orig/groff/pipeline.c Thu Jun 22 09:09:48 1995
--- src/groff/pipeline.c Wed May 01 19:40:16 1996
***************
*** 37,42 ****
--- 37,47 ----
#ifndef errno
extern int errno;
#endif
+ #ifdef __EMX__
+ #include <process.h>
+ extern char *execpath(char *);
+ #define vfork fork
+ #endif
extern char *strerror();
***************
*** 107,112 ****
--- 112,148 ----
int ret = 0;
int proc_count = ncommands;
+ #ifdef __EMX__
+ int output = dup(1);
+ for (i = 0; i < ncommands; i++) {
+ int pdes[2];
+ if (i != ncommands - 1) {
+ if (pipe(pdes) < 0)
+ sys_fatal("pipe");
+
+ dup2(pdes[1], 1);
+ close(pdes[1]);
+ pids[i] = spawnvp(P_NOWAIT, execpath(commands[i][0]),
+ (const char * const *) commands[i]);
+ if (pids[i] == -1)
+ error("couldn't spawn %1: %2", commands[i][0],
+ strerror(errno), (char *)0);
+ dup2(pdes[0], 0);
+ close(pdes[0]);
+ }
+ else
+ {
+ dup2(output, 1);
+ close(output);
+ pids[i] = spawnvp(P_NOWAIT, execpath(commands[i][0]),
+ (const char * const *) commands[i]);
+ if (pids[i] == -1)
+ error("couldn't spawn %1: %2", commands[i][0],
+ strerror(errno), (char *)0);
+ close(0);
+ }
+ }
+ #else
for (i = 0; i < ncommands; i++) {
int pdes[2];
PID_T pid;
***************
*** 155,160 ****
--- 191,197 ----
}
pids[i] = pid;
}
+ #endif
while (proc_count > 0) {
int status;
PID_T pid = wait(&status);
diff -cbr orig/grog/Makefile.sub src/grog/Makefile.sub
*** orig/grog/Makefile.sub Mon Apr 19 09:47:10 1993
--- src/grog/Makefile.sub Sun May 05 00:19:44 1996
***************
*** 1,7 ****
MAN1=grog.n
CLEANADD=grog
! all: grog
grog: grog.pl grog.sh
if test -n "$(PERLPATH)" && test -f "$(PERLPATH)"; then \
--- 1,7 ----
MAN1=grog.n
CLEANADD=grog
! # all: grog
grog: grog.pl grog.sh
if test -n "$(PERLPATH)" && test -f "$(PERLPATH)"; then \
diff -cbr orig/grolj4/Makefile.sub src/grolj4/Makefile.sub
*** orig/grolj4/Makefile.sub Wed Jul 06 18:39:52 1994
--- src/grolj4/Makefile.sub Wed May 01 19:27:24 1996
***************
*** 1,4 ****
! PROG=grolj4
MAN1=grolj4.n
XLIBS=$(LIBDRIVER) $(LIBGROFF)
MLIB=$(LIBM)
--- 1,4 ----
! PROG=grolj4$X
MAN1=grolj4.n
XLIBS=$(LIBDRIVER) $(LIBGROFF)
MLIB=$(LIBM)
diff -cbr orig/grops/Makefile.sub src/grops/Makefile.sub
*** orig/grops/Makefile.sub Tue Jul 21 16:18:58 1992
--- src/grops/Makefile.sub Sun Jan 02 18:00:16 1994
***************
*** 1,4 ****
! PROG=grops
MAN1=grops.n
XLIBS=$(LIBDRIVER) $(LIBGROFF)
MLIB=$(LIBM)
--- 1,4 ----
! PROG=grops$X
MAN1=grops.n
XLIBS=$(LIBDRIVER) $(LIBGROFF)
MLIB=$(LIBM)
diff -cbr orig/grotty/Makefile.sub src/grotty/Makefile.sub
*** orig/grotty/Makefile.sub Mon Jul 20 13:51:38 1992
--- src/grotty/Makefile.sub Sun Jan 02 18:00:20 1994
***************
*** 1,4 ****
! PROG=grotty
MAN1=grotty.n
XLIBS=$(LIBDRIVER) $(LIBGROFF)
MLIB=$(LIBM)
--- 1,4 ----
! PROG=grotty$X
MAN1=grotty.n
XLIBS=$(LIBDRIVER) $(LIBGROFF)
MLIB=$(LIBM)
diff -cbr orig/hpftodit/Makefile.sub src/hpftodit/Makefile.sub
*** orig/hpftodit/Makefile.sub Sun Jul 10 13:48:16 1994
--- src/hpftodit/Makefile.sub Wed May 01 19:29:24 1996
***************
*** 1,4 ****
! PROG=hpftodit
MAN1=hpftodit.n
XLIBS=$(LIBGROFF)
MLIB=$(LIBM)
--- 1,4 ----
! PROG=hpftodit$X
MAN1=hpftodit.n
XLIBS=$(LIBGROFF)
MLIB=$(LIBM)
diff -cbr orig/include/driver.h src/include/driver.h
*** orig/include/driver.h Thu Jun 22 08:41:28 1995
--- src/include/driver.h Wed May 01 19:40:16 1996
***************
*** 19,24 ****
--- 19,26 ----
Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
#include <stdio.h>
+ #include <io.h>
+ #include <fcntl.h>
#include <string.h>
#include <ctype.h>
#include <stdlib.h>
***************
*** 26,31 ****
--- 28,34 ----
#include <errno.h>
#include <assert.h>
#include <math.h>
+ #include <float.h>
#include "errarg.h"
#include "error.h"
#include "font.h"
diff -cbr orig/include/lib.h src/include/lib.h
*** orig/include/lib.h Thu Jun 22 08:41:28 1995
--- src/include/lib.h Wed May 01 19:40:16 1996
***************
*** 123,125 ****
--- 123,131 ----
#define ad_delete(size) delete []
#define a_delete delete []
#endif /* not ARRAY_DELETE_NEEDS_SIZE */
+
+ #if defined(__EMX__) || defined(__BORLANDC__)
+ #define PATHSEP ';'
+ #else
+ #define PATHSEP ':'
+ #endif
diff -cbr orig/indxbib/indxbib.cc src/indxbib/indxbib.cc
*** orig/indxbib/indxbib.cc Thu Jun 22 08:42:08 1995
--- src/indxbib/indxbib.cc Wed May 01 19:40:16 1996
***************
*** 19,24 ****
--- 19,25 ----
Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
#include <stdio.h>
+ #include <io.h>
#include <stdlib.h>
#include <string.h>
#include <assert.h>
diff -cbr orig/indxbib/Makefile.sub src/indxbib/Makefile.sub
*** orig/indxbib/Makefile.sub Mon Jan 04 22:57:32 1993
--- src/indxbib/Makefile.sub Sun Jan 02 18:00:56 1994
***************
*** 1,4 ****
! PROG=indxbib
MAN1=indxbib.n
XLIBS=$(LIBBIB) $(LIBGROFF)
MLIB=$(LIBM)
--- 1,4 ----
! PROG=indxbib$X
MAN1=indxbib.n
XLIBS=$(LIBBIB) $(LIBGROFF)
MLIB=$(LIBM)
diff -cbr orig/libbib/index.cc src/libbib/index.cc
*** orig/libbib/index.cc Thu Jun 22 08:41:40 1995
--- src/libbib/index.cc Wed May 01 19:40:16 1996
***************
*** 19,24 ****
--- 19,25 ----
Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
#include <stdio.h>
+ #include <io.h>
#include <string.h>
#include <stdlib.h>
#include <errno.h>
diff -cbr orig/libbib/linear.cc src/libbib/linear.cc
*** orig/libbib/linear.cc Thu Jun 22 08:41:40 1995
--- src/libbib/linear.cc Wed May 01 19:40:16 1996
***************
*** 19,24 ****
--- 19,25 ----
Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+ #include <io.h>
#include <string.h>
#include <stdlib.h>
#include <assert.h>
diff -cbr orig/libbib/map.c src/libbib/map.c
*** orig/libbib/map.c Thu Jun 22 08:41:40 1995
--- src/libbib/map.c Wed May 01 19:40:16 1996
***************
*** 60,66 ****
int fd;
int nbytes;
{
! errno = ENODEV;
return 0;
}
--- 60,66 ----
int fd;
int nbytes;
{
! errno = EINVAL;
return 0;
}
diff -cbr orig/libbib/search.cc src/libbib/search.cc
*** orig/libbib/search.cc Thu Jun 22 08:41:40 1995
--- src/libbib/search.cc Wed May 01 19:40:16 1996
***************
*** 18,23 ****
--- 18,24 ----
with groff; see the file COPYING. If not, write to the Free Software
Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+ #include <io.h>
#include <stdlib.h>
#include <string.h>
#include <assert.h>
diff -cbr orig/libgroff/font.cc src/libgroff/font.cc
*** orig/libgroff/font.cc Thu Jun 22 08:41:34 1995
--- src/libgroff/font.cc Wed May 01 19:40:16 1996
***************
*** 23,28 ****
--- 23,29 ----
#include <ctype.h>
#include <assert.h>
#include <math.h>
+ #include <float.h>
#include <stdlib.h>
#include "errarg.h"
#include "error.h"
diff -cbr orig/libgroff/fontfile.cc src/libgroff/fontfile.cc
*** orig/libgroff/fontfile.cc Thu Jun 22 08:41:34 1995
--- src/libgroff/fontfile.cc Wed May 01 19:32:36 1996
***************
*** 57,63 ****
FILE *font::open_file(const char *name, char **pathp)
{
char *filename = new char[strlen(name) + strlen(device) + 5];
! sprintf(filename, "dev%s/%s", device, name);
FILE *fp = font_path.open_file(filename, pathp);
a_delete filename;
return fp;
--- 57,63 ----
FILE *font::open_file(const char *name, char **pathp)
{
char *filename = new char[strlen(name) + strlen(device) + 5];
! sprintf(filename, "%s/%s", device, name);
FILE *fp = font_path.open_file(filename, pathp);
a_delete filename;
return fp;
diff -cbr orig/libgroff/Makefile.sub src/libgroff/Makefile.sub
*** orig/libgroff/Makefile.sub Sun Sep 06 09:44:36 1992
--- src/libgroff/Makefile.sub Sun May 05 01:20:24 1996
***************
*** 8,15 ****
nametoindex.cc new.cc prime.cc progname.cc ptable.cc searchpath.cc \
string.cc strsave.cc tmpfile.cc version.cc illegal.cc
CSRCS=fmod.c getcwd.c iftoa.c itoa.c matherr.c strerror.c strtol.c putenv.c
! GENSRCS=version.cc
version.cc: $(srcdir)/../VERSION
@echo Making version.cc
! @echo const char \*version_string = \"`cat $(srcdir)/../VERSION`\"\; >$@
--- 8,15 ----
nametoindex.cc new.cc prime.cc progname.cc ptable.cc searchpath.cc \
string.cc strsave.cc tmpfile.cc version.cc illegal.cc
CSRCS=fmod.c getcwd.c iftoa.c itoa.c matherr.c strerror.c strtol.c putenv.c
! #GENSRCS=version.cc
version.cc: $(srcdir)/../VERSION
@echo Making version.cc
! @echo const char \*version_string = \"1.10\"; >$@
diff -cbr orig/libgroff/new.cc src/libgroff/new.cc
*** orig/libgroff/new.cc Thu Jun 22 08:41:36 1995
--- src/libgroff/new.cc Wed May 01 19:40:16 1996
***************
*** 17,22 ****
--- 17,23 ----
with groff; see the file COPYING. If not, write to the Free Software
Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+ #include <io.h>
#include <stddef.h>
#include <stdlib.h>
#include <string.h>
***************
*** 56,67 ****
#endif /* not COOKIE_BUG */
}
- #ifdef COOKIE_BUG
-
void operator delete(void *p)
{
if (p)
free((void *)((char *)p - 8));
}
- #endif /* COOKIE_BUG */
--- 57,69 ----
#endif /* not COOKIE_BUG */
}
void operator delete(void *p)
{
if (p)
+ #ifdef COOKIE_BUG
free((void *)((char *)p - 8));
+ #else
+ free(p);
+ #endif /* COOKIE_BUG */
}
diff -cbr orig/libgroff/searchpath.cc src/libgroff/searchpath.cc
*** orig/libgroff/searchpath.cc Thu Jun 22 08:41:38 1995
--- src/libgroff/searchpath.cc Wed May 01 19:40:16 1996
***************
*** 32,38 ****
if (e && standard) {
dirs = new char[strlen(e) + strlen(standard) + 2];
strcpy(dirs, e);
! strcat(dirs, ":");
strcat(dirs, standard);
}
else
--- 32,39 ----
if (e && standard) {
dirs = new char[strlen(e) + strlen(standard) + 2];
strcpy(dirs, e);
! dirs[strlen(dirs) + 1] = 0;
! dirs[strlen(dirs)] = PATHSEP;
strcat(dirs, standard);
}
else
***************
*** 59,69 ****
char *p = dirs;
p += old_len - init_len;
if (init_len == 0)
! *p++ = ':';
memcpy(p, s, slen);
p += slen;
if (init_len > 0) {
! *p++ = ':';
memcpy(p, old + old_len - init_len, init_len);
p += init_len;
}
--- 60,70 ----
char *p = dirs;
p += old_len - init_len;
if (init_len == 0)
! *p++ = PATHSEP;
memcpy(p, s, slen);
p += slen;
if (init_len > 0) {
! *p++ = PATHSEP;
memcpy(p, old + old_len - init_len, init_len);
p += init_len;
}
***************
*** 88,94 ****
unsigned namelen = strlen(name);
char *p = dirs;
for (;;) {
! char *end = strchr(p, ':');
if (!end)
end = strchr(p, '\0');
int need_slash = end > p && end[-1] != '/';
--- 89,95 ----
unsigned namelen = strlen(name);
char *p = dirs;
for (;;) {
! char *end = strchr(p, PATHSEP);
if (!end)
end = strchr(p, '\0');
int need_slash = end > p && end[-1] != '/';
diff -cbr orig/libgroff/tmpfile.cc src/libgroff/tmpfile.cc
*** orig/libgroff/tmpfile.cc Thu Jun 22 08:41:38 1995
--- src/libgroff/tmpfile.cc Wed May 01 19:40:16 1996
***************
*** 43,48 ****
--- 43,50 ----
// Use this as the prefix for temporary filenames.
#define TMPFILE_PREFIX "groff"
+ #ifndef __EMX__
+
// Open a temporary file with fatal error on failure.
FILE *xtmpfile()
***************
*** 87,93 ****
return fp;
}
! #if 0
// If you're not running Unix, the following will do:
FILE *xtmpfile()
{
--- 89,96 ----
return fp;
}
! #else
!
// If you're not running Unix, the following will do:
FILE *xtmpfile()
{
***************
*** 96,99 ****
--- 99,103 ----
fatal("couldn't create temporary file");
return fp;
}
+
#endif
diff -cbr orig/lkbib/Makefile.sub src/lkbib/Makefile.sub
*** orig/lkbib/Makefile.sub Tue Jul 21 11:04:28 1992
--- src/lkbib/Makefile.sub Sun Jan 02 18:00:58 1994
***************
*** 1,4 ****
! PROG=lkbib
MAN1=lkbib.n
XLIBS=$(LIBBIB) $(LIBGROFF)
MLIB=$(LIBM)
--- 1,4 ----
! PROG=lkbib$X
MAN1=lkbib.n
XLIBS=$(LIBBIB) $(LIBGROFF)
MLIB=$(LIBM)
diff -cbr orig/lookbib/Makefile.sub src/lookbib/Makefile.sub
*** orig/lookbib/Makefile.sub Tue Jul 21 14:57:02 1992
--- src/lookbib/Makefile.sub Sun Jan 02 18:00:52 1994
***************
*** 1,4 ****
! PROG=lookbib
MAN1=lookbib.n
XLIBS=$(LIBBIB) $(LIBGROFF)
MLIB=$(LIBM)
--- 1,4 ----
! PROG=lookbib$X
MAN1=lookbib.n
XLIBS=$(LIBBIB) $(LIBGROFF)
MLIB=$(LIBM)
diff -cbr orig/Makefile.comm src/Makefile.comm
*** orig/Makefile.comm Tue Jun 27 12:08:26 1995
--- src/Makefile.comm Sun May 05 01:10:48 1996
***************
*** 19,25 ****
#
# Makefile.comm
#
! SHELL=/bin/sh
INCLUDES=-I. -I$(srcdir) -I../include -I$(srcdir)/../include
ALL_CCFLAGS=$(INCLUDES) $(CCDEFINES) $(CCFLAGS) $(CPPFLAGS)
COMPILE.cc=$(CCC) $(ALL_CCFLAGS) -c
--- 19,25 ----
#
# Makefile.comm
#
! #SHELL=/bin/sh
INCLUDES=-I. -I$(srcdir) -I../include -I$(srcdir)/../include
ALL_CCFLAGS=$(INCLUDES) $(CCDEFINES) $(CCFLAGS) $(CPPFLAGS)
COMPILE.cc=$(CCC) $(ALL_CCFLAGS) -c
***************
*** 82,91 ****
.SUFFIXES: .o .cc .c .y .man .n
.cc.o:
! $(COMPILE.cc) $<
.c.o:
! $(COMPILE.c) $<
.y.cc:
if test -n "$(YTABH)"; then \
--- 82,91 ----
.SUFFIXES: .o .cc .c .y .man .n
.cc.o:
! $(COMPILE.cc) -o $@ $<
.c.o:
! $(COMPILE.c) -o $@ $<
.y.cc:
if test -n "$(YTABH)"; then \
***************
*** 107,132 ****
.man.n:
@echo Making $@ from $<
@-rm -f $@
! @sed -e "s;@FONTDIR@;$(fontdir);g" \
! -e "s;@FONTPATH@;$(fontpath);g" \
! -e "s;@MACRODIR@;$(tmacdir);g" \
! -e "s;@MACROPATH@;$(tmacpath);g" \
! -e "s;@DEVICE@;$(DEVICE);g" \
! -e "s;@DEFAULT_INDEX@;$(indexdir)/$(indexname);g" \
! -e "s;@DEFAULT_INDEX_NAME@;$(indexname);g" \
! -e "s;@INDEX_SUFFIX@;$(indexext);g" \
! -e "s;@COMMON_WORDS_FILE@;$(common_words_file);g" \
! -e "s;@MAN1EXT@;$(man1ext);g" \
! -e "s;@MAN5EXT@;$(man5ext);g" \
! -e "s;@MAN7EXT@;$(man7ext);g" \
! -e "s;@TMAC_S_PREFIX@;$(tmac_s_prefix);g" \
! -e "s;@TMAC_M_PREFIX@;$(tmac_m_prefix);g" \
! -e "s;@TMAC_MDIR@;$(tmacdir)/mm;g" \
! -e "s;@BROKEN_SPOOLER_FLAGS@;$(BROKEN_SPOOLER_FLAGS);g" \
! -e "s;@VERSION@;`cat $(srcdir)/../VERSION`;g" \
! -e "s;@MDATE@;`$(SHELL) $(srcdir)/../mdate.sh $<`;g" \
! -e "s;@g@;$(g);g" \
! -e "s;@G@;`echo $(g) | tr [a-z] [A-Z]`;g" \
$< >$@
.PHONY: install_man
--- 107,132 ----
.man.n:
@echo Making $@ from $<
@-rm -f $@
! @sed -e "s!@FONTDIR@!$(fontdir)!g" \
! -e "s!@FONTPATH@!$(fontpath)!g" \
! -e "s!@MACRODIR@!$(tmacdir)!g" \
! -e "s!@MACROPATH@!$(tmacpath)!g" \
! -e "s!@DEVICE@!$(DEVICE)!g" \
! -e "s!@DEFAULT_INDEX@!$(indexdir)/$(indexname)!g" \
! -e "s!@DEFAULT_INDEX_NAME@!$(indexname)!g" \
! -e "s!@INDEX_SUFFIX@!$(indexext)!g" \
! -e "s!@COMMON_WORDS_FILE@!$(common_words_file)!g" \
! -e "s!@MAN1EXT@!$(man1ext)!g" \
! -e "s!@MAN5EXT@!$(man5ext)!g" \
! -e "s!@MAN7EXT@!$(man7ext)!g" \
! -e "s!@TMAC_S_PREFIX@!$(tmac_s_prefix)!g" \
! -e "s!@TMAC_M_PREFIX@!$(tmac_m_prefix)!g" \
! -e "s!@TMAC_MDIR@!$(tmacdir)/mm!g" \
! -e "s!@BROKEN_SPOOLER_FLAGS@!$(BROKEN_SPOOLER_FLAGS)!g" \
! -e "s!@VERSION@!1.10!g" \
! -e "s!@MDATE@!01 May 1996!g" \
! -e "s!@g@!!g" \
! -e "s!@G@!!g" \
$< >$@
.PHONY: install_man
diff -cbr orig/Makefile.lib src/Makefile.lib
*** orig/Makefile.lib Thu Sep 29 09:43:48 1994
--- src/Makefile.lib Sun Jan 02 17:56:28 1994
***************
*** 5,11 ****
all: lib$(LIB).a
lib$(LIB).a: $(OBJS)
! $(AR) r $@ $?
$(RANLIB) $@
depend: depend_src
--- 5,12 ----
all: lib$(LIB).a
lib$(LIB).a: $(OBJS)
! -rm -f $@
! $(AR) r $@ $(OBJS)
$(RANLIB) $@
depend: depend_src
diff -cbr orig/mdate.sh src/mdate.sh
*** orig/mdate.sh Fri Sep 25 11:40:58 1992
--- src/mdate.sh Sun Jan 02 18:10:40 1994
***************
*** 7,15 ****
LANGUAGE=
! (date;
! if ls -L /dev/null 1>/dev/null 2>&1; then ls -L -l $1; else ls -l $1; fi
! ) | awk '
BEGIN {
full["Jan"] = "January"; number["Jan"] = 1;
full["Feb"] = "February"; number["Feb"] = 2;
--- 7,13 ----
LANGUAGE=
! (date; ls -l $1) | gawk '
BEGIN {
full["Jan"] = "January"; number["Jan"] = 1;
full["Feb"] = "February"; number["Feb"] = 2;
diff -cbr orig/pfbtops/Makefile.sub src/pfbtops/Makefile.sub
*** orig/pfbtops/Makefile.sub Sun Aug 02 10:48:44 1992
--- src/pfbtops/Makefile.sub Sun Jan 02 18:01:08 1994
***************
*** 1,4 ****
! PROG=pfbtops
MAN1=pfbtops.n
OBJS=pfbtops.o
CSRCS=pfbtops.c
--- 1,4 ----
! PROG=pfbtops$X
MAN1=pfbtops.n
OBJS=pfbtops.o
CSRCS=pfbtops.c
diff -cbr orig/pic/Makefile.sub src/pic/Makefile.sub
*** orig/pic/Makefile.sub Tue Jul 21 18:24:08 1992
--- src/pic/Makefile.sub Sun Jan 02 17:58:52 1994
***************
*** 1,4 ****
! PROG=pic
MAN1=pic.n
XLIBS=$(LIBGROFF)
MLIB=$(LIBM)
--- 1,4 ----
! PROG=pic$X
MAN1=pic.n
XLIBS=$(LIBGROFF)
MLIB=$(LIBM)
diff -cbr orig/psbb/Makefile.sub src/psbb/Makefile.sub
*** orig/psbb/Makefile.sub Tue Aug 18 18:34:44 1992
--- src/psbb/Makefile.sub Sun Jan 02 18:01:10 1994
***************
*** 1,4 ****
! PROG=psbb
MAN1=psbb.n
OBJS=psbb.o
CSRCS=psbb.c
--- 1,4 ----
! PROG=psbb$X
MAN1=psbb.n
OBJS=psbb.o
CSRCS=psbb.c
diff -cbr orig/refer/Makefile.sub src/refer/Makefile.sub
*** orig/refer/Makefile.sub Tue Jul 21 16:19:44 1992
--- src/refer/Makefile.sub Sun Jan 02 18:00:48 1994
***************
*** 1,4 ****
! PROG=refer
MAN1=refer.n
XLIBS=$(LIBBIB) $(LIBGROFF)
MLIB=$(LIBM)
--- 1,4 ----
! PROG=refer$X
MAN1=refer.n
XLIBS=$(LIBBIB) $(LIBGROFF)
MLIB=$(LIBM)
diff -cbr orig/soelim/Makefile.sub src/soelim/Makefile.sub
*** orig/soelim/Makefile.sub Tue Jul 21 14:56:02 1992
--- src/soelim/Makefile.sub Sun Jan 02 18:01:02 1994
***************
*** 1,4 ****
! PROG=soelim
MAN1=soelim.n
XLIBS=$(LIBGROFF)
OBJS=soelim.o
--- 1,4 ----
! PROG=soelim$X
MAN1=soelim.n
XLIBS=$(LIBGROFF)
OBJS=soelim.o
diff -cbr orig/tbl/Makefile.sub src/tbl/Makefile.sub
*** orig/tbl/Makefile.sub Tue Jul 21 16:17:42 1992
--- src/tbl/Makefile.sub Sun Jan 02 17:58:58 1994
***************
*** 1,4 ****
! PROG=tbl
MAN1=tbl.n
XLIBS=$(LIBGROFF)
OBJS=main.o table.o
--- 1,4 ----
! PROG=tbl$X
MAN1=tbl.n
XLIBS=$(LIBGROFF)
OBJS=main.o table.o
diff -cbr orig/tfmtodit/Makefile.sub src/tfmtodit/Makefile.sub
*** orig/tfmtodit/Makefile.sub Mon Jul 20 13:51:44 1992
--- src/tfmtodit/Makefile.sub Sun Jan 02 18:00:44 1994
***************
*** 1,4 ****
! PROG=tfmtodit
MAN1=tfmtodit.n
XLIBS=$(LIBGROFF)
MLIB=$(LIBM)
--- 1,4 ----
! PROG=tfmtodit$X
MAN1=tfmtodit.n
XLIBS=$(LIBGROFF)
MLIB=$(LIBM)
diff -cbr orig/tfmtodit/tfmtodit.cc src/tfmtodit/tfmtodit.cc
*** orig/tfmtodit/tfmtodit.cc Thu Jun 22 08:42:02 1995
--- src/tfmtodit/tfmtodit.cc Wed May 01 19:40:18 1996
***************
*** 50,55 ****
--- 50,56 ----
#include <stdio.h>
#include <stdlib.h>
#include <math.h>
+ #include <float.h>
#include <string.h>
#include <errno.h>
#include "lib.h"
diff -cbr orig/tmac/Makefile.sub src/tmac/Makefile.sub
*** orig/tmac/Makefile.sub Tue Jun 27 12:36:36 1995
--- src/tmac/Makefile.sub Sun May 05 00:34:12 1996
***************
*** 14,20 ****
tmac_wrap=
sys_tmac_prefix=
! all: stamp-strip stamp-wrap
install_data: $(NORMALFILES) $(SPECIALFILES) stamp-wrap stamp-strip man.local
-test -d $(tmacdir) || mkdir $(tmacdir)
--- 14,20 ----
tmac_wrap=
sys_tmac_prefix=
! # all: stamp-strip stamp-wrap
install_data: $(NORMALFILES) $(SPECIALFILES) stamp-wrap stamp-strip man.local
-test -d $(tmacdir) || mkdir $(tmacdir)
diff -cbr orig/troff/input.cc src/troff/input.cc
*** orig/troff/input.cc Thu Jun 22 08:41:44 1995
--- src/troff/input.cc Wed May 01 19:40:18 1996
***************
*** 49,55 ****
--- 49,59 ----
#endif /* not ISATTY_MISSING */
#define USAGE_EXIT_CODE 1
+ #ifdef __EMX__
+ #define MACRO_PREFIX ""
+ #else
#define MACRO_PREFIX "tmac."
+ #endif
#define STARTUP_FILE "troffrc"
#define DEFAULT_INPUT_STACK_LIMIT 1000
diff -cbr orig/troff/Makefile.sub src/troff/Makefile.sub
*** orig/troff/Makefile.sub Wed Oct 28 13:47:58 1992
--- src/troff/Makefile.sub Sun May 05 01:20:32 1996
***************
*** 1,4 ****
! PROG=troff
MAN1=troff.n
XLIBS=$(LIBGROFF)
MLIB=$(LIBM)
--- 1,4 ----
! PROG=troff$X
MAN1=troff.n
XLIBS=$(LIBGROFF)
MLIB=$(LIBM)
***************
*** 8,23 ****
number.cc majorminor.cc
HDRS=charinfo.h dictionary.h div.h env.h hvunits.h node.h reg.h request.h \
symbol.h token.h troff.h
! GENSRCS=majorminor.cc
NAMEPREFIX=$(g)
majorminor.cc: ../VERSION
@echo Making $@
@-rm -f $@
! @echo const char \*major_version = \
! \"`sed -e 's/^\([^.]*\)\..*$$/\1/' $(srcdir)/../VERSION`\"\; >$@
! @echo const char \*minor_version = \
! \"`sed -e 's/^[^.]*\.\([0-9]*\).*$$/\1/' $(srcdir)/../VERSION`\"\; >>$@
install_data: hyphen.us
-test -d $(datadir) || mkdir $(datadir)
--- 8,21 ----
number.cc majorminor.cc
HDRS=charinfo.h dictionary.h div.h env.h hvunits.h node.h reg.h request.h \
symbol.h token.h troff.h
! #GENSRCS=majorminor.cc
NAMEPREFIX=$(g)
majorminor.cc: ../VERSION
@echo Making $@
@-rm -f $@
! @echo const char \*major_version = \"1\"; >$@
! @echo const char \*minor_version = \"10\"; >>$@
install_data: hyphen.us
-test -d $(datadir) || mkdir $(datadir)