aboutsummaryrefslogtreecommitdiffstats
path: root/troff/nroff.d
diff options
context:
space:
mode:
Diffstat (limited to 'troff/nroff.d')
-rw-r--r--troff/nroff.d/Makefile.mk9
-rw-r--r--troff/nroff.d/n6.c2
-rw-r--r--troff/nroff.d/nroff.1.in (renamed from troff/nroff.d/nroff.1)0
-rw-r--r--troff/nroff.d/pt.h1
4 files changed, 9 insertions, 3 deletions
diff --git a/troff/nroff.d/Makefile.mk b/troff/nroff.d/Makefile.mk
index 82c9667083af..2a86c0e8d55c 100644
--- a/troff/nroff.d/Makefile.mk
+++ b/troff/nroff.d/Makefile.mk
@@ -15,7 +15,7 @@ FLAGS = -DNROFF -DUSG $(EUC) -I. -I.. -I../../include -DMACDIR='"$(MACDIR)"' \
.c.o:
$(CC) $(_CFLAGS) $(FLAGS) -c $<
-all: nroff
+all: nroff nroff.1
nroff: $(OBJ) $(LIBHNJ)/libhnj.a
$(CC) $(_CFLAGS) $(_LDFLAGS) $(OBJ) -L$(LIBHNJ) -lhnj $(LIBS) -o nroff
@@ -26,10 +26,15 @@ install:
$(INSTALL) -c -m 644 nroff.1 $(ROOT)$(MANDIR)/man1/nroff.1
clean:
- rm -f $(OBJ) nroff core log *~
+ rm -f $(OBJ) nroff core log *~ nroff.1
mrproper: clean
+nroff.1: nroff.1.in
+ sed -e 's"/usr/ucblib/doctools/tmac/"$(ROOT)$(MACDIR)/"' \
+ -e 's"/usr/ucblib/doctools/nterm/"$(ROOT)$(TABDIR)/"' \
+ nroff.1.in > $@
+
draw.o: ../tdef.h ../ext.h
n10.o: n10.c ../tdef.h ../ext.h tw.h pt.h
n6.o: n6.c ../tdef.h tw.h pt.h ../ext.h
diff --git a/troff/nroff.d/n6.c b/troff/nroff.d/n6.c
index 3754bd939dff..a62101202ba9 100644
--- a/troff/nroff.d/n6.c
+++ b/troff/nroff.d/n6.c
@@ -101,7 +101,7 @@ width(register tchar j)
else if (iscontrol(i))
return(0);
}
- if (i==ohc)
+ if ((size_t)i==ohc)
return(0);
#ifdef EUC
if (multi_locale && i >= nchtab + _SPECCHAR_ST) {
diff --git a/troff/nroff.d/nroff.1 b/troff/nroff.d/nroff.1.in
index 9e1a982c9db0..9e1a982c9db0 100644
--- a/troff/nroff.d/nroff.1
+++ b/troff/nroff.d/nroff.1.in
diff --git a/troff/nroff.d/pt.h b/troff/nroff.d/pt.h
index 2f095f371265..e485825c137f 100644
--- a/troff/nroff.d/pt.h
+++ b/troff/nroff.d/pt.h
@@ -13,6 +13,7 @@ extern void specnames(void);
extern int findch(register const char *);
extern void twdone(void);
extern void ptout1(void);
+void ptout(tchar);
extern char *plot(char *);
extern void move(void);
extern void ptlead(void);