summaryrefslogtreecommitdiff
path: root/gnu/usr.bin/groff/src/roff
diff options
context:
space:
mode:
authorwiz <wiz@NetBSD.org>2003-06-30 18:40:50 +0000
committerwiz <wiz@NetBSD.org>2003-06-30 18:40:50 +0000
commitbf7bd150bbfa358634a702be2293a7244d6459a3 (patch)
treeb088816c60913f9f00024d65d26d9beddef45b4a /gnu/usr.bin/groff/src/roff
parent97a4aa1713e7d35aa2bd636515f58e295d2c2b17 (diff)
Make groff-1.19 build on NetBSD.
Diffstat (limited to 'gnu/usr.bin/groff/src/roff')
-rw-r--r--gnu/usr.bin/groff/src/roff/Makefile4
-rw-r--r--gnu/usr.bin/groff/src/roff/Makefile.inc3
-rw-r--r--gnu/usr.bin/groff/src/roff/groff/Makefile6
-rw-r--r--gnu/usr.bin/groff/src/roff/grog/Makefile2
-rw-r--r--gnu/usr.bin/groff/src/roff/nroff/Makefile2
-rw-r--r--gnu/usr.bin/groff/src/roff/psroff/Makefile2
-rw-r--r--gnu/usr.bin/groff/src/roff/troff/Makefile6
7 files changed, 17 insertions, 8 deletions
diff --git a/gnu/usr.bin/groff/src/roff/Makefile b/gnu/usr.bin/groff/src/roff/Makefile
index e0ab68576eb..cc739ce0534 100644
--- a/gnu/usr.bin/groff/src/roff/Makefile
+++ b/gnu/usr.bin/groff/src/roff/Makefile
@@ -1,5 +1,7 @@
# $FreeBSD: src/gnu/usr.bin/groff/src/roff/Makefile,v 1.1 2001/04/17 12:37:12 ru Exp $
-SUBDIR= groff grog nroff psroff troff
+SUBDIR= groff grog nroff troff
+# obsoleted in NetBSD:
+#SUBDIR+= psroff
.include <bsd.subdir.mk>
diff --git a/gnu/usr.bin/groff/src/roff/Makefile.inc b/gnu/usr.bin/groff/src/roff/Makefile.inc
index a910a7134dc..c7643ca5094 100644
--- a/gnu/usr.bin/groff/src/roff/Makefile.inc
+++ b/gnu/usr.bin/groff/src/roff/Makefile.inc
@@ -1,6 +1,3 @@
# $FreeBSD: src/gnu/usr.bin/groff/src/roff/Makefile.inc,v 1.1 2001/04/17 12:37:12 ru Exp $
-TOPREL= ../../..
-DIST_SUBDIR= src/roff/${.CURDIR:T}
-
.include "../../Makefile.inc"
diff --git a/gnu/usr.bin/groff/src/roff/groff/Makefile b/gnu/usr.bin/groff/src/roff/groff/Makefile
index f963934a934..dfbf37d91d8 100644
--- a/gnu/usr.bin/groff/src/roff/groff/Makefile
+++ b/gnu/usr.bin/groff/src/roff/groff/Makefile
@@ -1,9 +1,11 @@
# $FreeBSD: src/gnu/usr.bin/groff/src/roff/groff/Makefile,v 1.7 2003/05/01 13:22:20 ru Exp $
+DIST_SUBDIR= src/roff/groff
+
PROG_CXX= groff
SRCS= groff.cpp pipeline.c
-DPADD= ${LIBGROFF} ${LIBM}
-LDADD= ${LIBGROFF} -lm
+DPADD+= ${LIBGROFF} ${LIBM}
+LDADD+= ${LIBGROFF} -lm
CLEANFILES= ${MAN}
.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/src/roff/grog/Makefile b/gnu/usr.bin/groff/src/roff/grog/Makefile
index 09b3b90dcb3..b280b0409be 100644
--- a/gnu/usr.bin/groff/src/roff/grog/Makefile
+++ b/gnu/usr.bin/groff/src/roff/grog/Makefile
@@ -1,5 +1,7 @@
# $FreeBSD: src/gnu/usr.bin/groff/src/roff/grog/Makefile,v 1.1 2001/04/17 12:37:12 ru Exp $
+DIST_SUBDIR= src/roff/grog
+
SCRIPTS= grog
MAN= grog.1
CLEANFILES= ${SCRIPTS} ${MAN}
diff --git a/gnu/usr.bin/groff/src/roff/nroff/Makefile b/gnu/usr.bin/groff/src/roff/nroff/Makefile
index be4631f42da..c8d1882382d 100644
--- a/gnu/usr.bin/groff/src/roff/nroff/Makefile
+++ b/gnu/usr.bin/groff/src/roff/nroff/Makefile
@@ -1,5 +1,7 @@
# $FreeBSD: src/gnu/usr.bin/groff/src/roff/nroff/Makefile,v 1.1 2001/04/17 12:37:13 ru Exp $
+DIST_SUBDIR= src/roff/nroff
+
SCRIPTS= nroff
MAN= nroff.1
CLEANFILES= ${SCRIPTS} ${MAN}
diff --git a/gnu/usr.bin/groff/src/roff/psroff/Makefile b/gnu/usr.bin/groff/src/roff/psroff/Makefile
index 508f69c27ed..83487673713 100644
--- a/gnu/usr.bin/groff/src/roff/psroff/Makefile
+++ b/gnu/usr.bin/groff/src/roff/psroff/Makefile
@@ -1,5 +1,7 @@
# $FreeBSD: src/gnu/usr.bin/groff/src/roff/psroff/Makefile,v 1.1 2001/04/17 12:37:13 ru Exp $
+DIST_SUBDIR= src/roff/psroff
+
SCRIPTS= psroff.sh
MAN= psroff.1
diff --git a/gnu/usr.bin/groff/src/roff/troff/Makefile b/gnu/usr.bin/groff/src/roff/troff/Makefile
index 74a38c7522d..ebc9e943af3 100644
--- a/gnu/usr.bin/groff/src/roff/troff/Makefile
+++ b/gnu/usr.bin/groff/src/roff/troff/Makefile
@@ -1,11 +1,13 @@
# $FreeBSD: src/gnu/usr.bin/groff/src/roff/troff/Makefile,v 1.4 2003/05/01 13:22:20 ru Exp $
+DIST_SUBDIR= src/roff/troff
+
PROG_CXX= troff
SRCS= dictionary.cpp div.cpp env.cpp glyphuni.cpp input.cpp \
majorminor.cpp node.cpp number.cpp reg.cpp symbol.cpp \
unicode.cpp uniglyph.cpp uniuni.cpp
-DPADD= ${LIBGROFF} ${LIBM}
-LDADD= ${LIBGROFF} -lm
+DPADD+= ${LIBGROFF} ${LIBM}
+LDADD+= ${LIBGROFF} -lm
CLEANFILES= majorminor.cpp ${MAN}
.include <bsd.prog.mk>