From addf74bf1e01f869131f0d788826b74388627e66 Mon Sep 17 00:00:00 2001 From: mycroft Date: Sun, 18 Jul 1993 12:46:09 +0000 Subject: [PATCH] Fix some lossage that was caused bsd.prog.mk to be included twice. --- gnu/usr.bin/groff/Makefile.cfg | 2 -- gnu/usr.bin/groff/addftinfo/Makefile | 2 +- gnu/usr.bin/groff/afmtodit/Makefile | 2 +- gnu/usr.bin/groff/eqn/Makefile | 2 +- gnu/usr.bin/groff/grodvi/Makefile | 2 +- gnu/usr.bin/groff/groff/Makefile | 2 +- gnu/usr.bin/groff/grog/Makefile | 2 +- gnu/usr.bin/groff/grops/Makefile | 2 +- gnu/usr.bin/groff/grotty/Makefile | 2 +- gnu/usr.bin/groff/indxbib/Makefile | 2 +- gnu/usr.bin/groff/libbib/Makefile | 2 +- gnu/usr.bin/groff/libdriver/Makefile | 2 +- gnu/usr.bin/groff/libgroff/Makefile | 2 +- gnu/usr.bin/groff/lkbib/Makefile | 2 +- gnu/usr.bin/groff/lookbib/Makefile | 2 +- gnu/usr.bin/groff/man/Makefile | 2 +- gnu/usr.bin/groff/mm/Makefile | 2 +- gnu/usr.bin/groff/nroff/Makefile | 2 +- gnu/usr.bin/groff/pfbtops/Makefile | 2 +- gnu/usr.bin/groff/pic/Makefile | 2 +- gnu/usr.bin/groff/psbb/Makefile | 2 +- gnu/usr.bin/groff/refer/Makefile | 2 +- gnu/usr.bin/groff/soelim/Makefile | 2 +- gnu/usr.bin/groff/tbl/Makefile | 2 +- gnu/usr.bin/groff/tfmtodit/Makefile | 2 +- gnu/usr.bin/groff/tmac/Makefile | 2 +- gnu/usr.bin/groff/troff/Makefile | 2 +- 27 files changed, 26 insertions(+), 28 deletions(-) diff --git a/gnu/usr.bin/groff/Makefile.cfg b/gnu/usr.bin/groff/Makefile.cfg index ee4efb84640b..f6987cdd51ae 100644 --- a/gnu/usr.bin/groff/Makefile.cfg +++ b/gnu/usr.bin/groff/Makefile.cfg @@ -45,5 +45,3 @@ CC= $(CXX) $(YACC) $(YFLAGS) $(.IMPSRC) mv y.tab.c $(.PREFIX).cc mv y.tab.h $(.PREFIX).tab.h - -.include diff --git a/gnu/usr.bin/groff/addftinfo/Makefile b/gnu/usr.bin/groff/addftinfo/Makefile index cad196de2f94..b83e7da382dd 100644 --- a/gnu/usr.bin/groff/addftinfo/Makefile +++ b/gnu/usr.bin/groff/addftinfo/Makefile @@ -6,6 +6,6 @@ CFLAGS+= -I$(.CURDIR)/../include LDADD+= $(LIBGROFF) DPADD+= $(LIBGROFF) -.include .include "../../Makefile.inc" .include "../Makefile.cfg" +.include diff --git a/gnu/usr.bin/groff/afmtodit/Makefile b/gnu/usr.bin/groff/afmtodit/Makefile index 74daa303ba8a..4720592a66a2 100644 --- a/gnu/usr.bin/groff/afmtodit/Makefile +++ b/gnu/usr.bin/groff/afmtodit/Makefile @@ -4,6 +4,6 @@ afterinstall: install -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ $(.CURDIR)/afmtodit.pl $(DESTDIR)$(BINDIR)/afmtodit -.include .include <../../Makefile.inc> .include <../Makefile.cfg> +.include diff --git a/gnu/usr.bin/groff/eqn/Makefile b/gnu/usr.bin/groff/eqn/Makefile index 214e6549fa4a..640688205fbb 100644 --- a/gnu/usr.bin/groff/eqn/Makefile +++ b/gnu/usr.bin/groff/eqn/Makefile @@ -15,6 +15,6 @@ afterinstall: chown ${BINOWN}.${BINGRP} $(DESTDIR)$(BINDIR)/neqn chmod ${BINMODE} $(DESTDIR)$(BINDIR)/neqn -.include .include "../../Makefile.inc" .include "../Makefile.cfg" +.include diff --git a/gnu/usr.bin/groff/grodvi/Makefile b/gnu/usr.bin/groff/grodvi/Makefile index f579cf3a4bfa..297a93573688 100644 --- a/gnu/usr.bin/groff/grodvi/Makefile +++ b/gnu/usr.bin/groff/grodvi/Makefile @@ -6,6 +6,6 @@ CFLAGS+= -I$(.CURDIR)/../include LDADD+= $(LIBDRIVER) $(LIBGROFF) -lm DPADD+= $(LIBDRIVER) $(LIBGROFF) $(LIBMATH) -.include .include "../../Makefile.inc" .include "../Makefile.cfg" +.include diff --git a/gnu/usr.bin/groff/groff/Makefile b/gnu/usr.bin/groff/groff/Makefile index 99479ce1299d..73e6d52346a6 100644 --- a/gnu/usr.bin/groff/groff/Makefile +++ b/gnu/usr.bin/groff/groff/Makefile @@ -6,6 +6,6 @@ CFLAGS+= -I$(.CURDIR)/../include LDADD+= $(LIBGROFF) -lm DPADD+= $(LIBGROFF) $(LIBMATH) -.include .include "../../Makefile.inc" .include "../Makefile.cfg" +.include diff --git a/gnu/usr.bin/groff/grog/Makefile b/gnu/usr.bin/groff/grog/Makefile index 379befdc2947..a033b72a2d5c 100644 --- a/gnu/usr.bin/groff/grog/Makefile +++ b/gnu/usr.bin/groff/grog/Makefile @@ -4,5 +4,5 @@ afterinstall: install -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ $(.CURDIR)/grog.pl $(DESTDIR)$(BINDIR)/grog -.include .include <../../Makefile.inc> +.include diff --git a/gnu/usr.bin/groff/grops/Makefile b/gnu/usr.bin/groff/grops/Makefile index 03282aa0e463..633c7618d867 100644 --- a/gnu/usr.bin/groff/grops/Makefile +++ b/gnu/usr.bin/groff/grops/Makefile @@ -6,6 +6,6 @@ CFLAGS+= -I$(.CURDIR)/../include LDADD+= $(LIBDRIVER) $(LIBGROFF) -lm DPADD+= $(LIBDRIVER) $(LIBGROFF) $(LIBMATH) -.include .include "../../Makefile.inc" .include "../Makefile.cfg" +.include diff --git a/gnu/usr.bin/groff/grotty/Makefile b/gnu/usr.bin/groff/grotty/Makefile index a245085a063e..4ff0de10cf5c 100644 --- a/gnu/usr.bin/groff/grotty/Makefile +++ b/gnu/usr.bin/groff/grotty/Makefile @@ -6,6 +6,6 @@ CFLAGS+= -I$(.CURDIR)/../include LDADD+= $(LIBDRIVER) $(LIBGROFF) -lm DPADD+= $(LIBDRIVER) $(LIBGROFF) $(LIBMATH) -.include .include "../../Makefile.inc" .include "../Makefile.cfg" +.include diff --git a/gnu/usr.bin/groff/indxbib/Makefile b/gnu/usr.bin/groff/indxbib/Makefile index 7c9c56ec15e9..35951aabf83d 100644 --- a/gnu/usr.bin/groff/indxbib/Makefile +++ b/gnu/usr.bin/groff/indxbib/Makefile @@ -13,6 +13,6 @@ afterinstall: install -c -o ${BINOWN} -g ${BINGRP} -m 444 $(.CURDIR)/eign \ $(DESTDIR)$(COMMON_WORDS_FILE) -.include .include "../../Makefile.inc" .include "../Makefile.cfg" +.include diff --git a/gnu/usr.bin/groff/libbib/Makefile b/gnu/usr.bin/groff/libbib/Makefile index 45b80e416903..df2c5a955caa 100644 --- a/gnu/usr.bin/groff/libbib/Makefile +++ b/gnu/usr.bin/groff/libbib/Makefile @@ -9,5 +9,5 @@ NOPROFILE= noprofile install: -.include .include "../Makefile.cfg" +.include diff --git a/gnu/usr.bin/groff/libdriver/Makefile b/gnu/usr.bin/groff/libdriver/Makefile index aafc6fe3c3fb..780a0e1c14b3 100644 --- a/gnu/usr.bin/groff/libdriver/Makefile +++ b/gnu/usr.bin/groff/libdriver/Makefile @@ -9,5 +9,5 @@ NOPROFILE= noprofile install: -.include .include "../Makefile.cfg" +.include diff --git a/gnu/usr.bin/groff/libgroff/Makefile b/gnu/usr.bin/groff/libgroff/Makefile index 8cb9db360e0d..386f45094880 100644 --- a/gnu/usr.bin/groff/libgroff/Makefile +++ b/gnu/usr.bin/groff/libgroff/Makefile @@ -19,5 +19,5 @@ version.cc: $(.CURDIR)/../VERSION install: -.include .include "../Makefile.cfg" +.include diff --git a/gnu/usr.bin/groff/lkbib/Makefile b/gnu/usr.bin/groff/lkbib/Makefile index f74d9f9220d6..f2512032191c 100644 --- a/gnu/usr.bin/groff/lkbib/Makefile +++ b/gnu/usr.bin/groff/lkbib/Makefile @@ -6,6 +6,6 @@ CFLAGS+= -I$(.CURDIR)/../include LDADD+= $(LIBBIB) $(LIBGROFF) -lm DPADD+= $(LIBBIB) $(LIBGROFF) $(LIBMATH) -.include .include "../../Makefile.inc" .include "../Makefile.cfg" +.include diff --git a/gnu/usr.bin/groff/lookbib/Makefile b/gnu/usr.bin/groff/lookbib/Makefile index 2f93a2f68f0d..f395563b0ca8 100644 --- a/gnu/usr.bin/groff/lookbib/Makefile +++ b/gnu/usr.bin/groff/lookbib/Makefile @@ -6,6 +6,6 @@ CFLAGS+= -I$(.CURDIR)/../include LDADD+= $(LIBBIB) $(LIBGROFF) -lm DPADD+= $(LIBBIB) $(LIBGROFF) $(LIBMATH) -.include .include "../../Makefile.inc" .include "../Makefile.cfg" +.include diff --git a/gnu/usr.bin/groff/man/Makefile b/gnu/usr.bin/groff/man/Makefile index ef61aca3da06..e9b8123aaf98 100644 --- a/gnu/usr.bin/groff/man/Makefile +++ b/gnu/usr.bin/groff/man/Makefile @@ -3,5 +3,5 @@ MAN5= groff_font.0 groff_out.0 MAN7= groff_char.0 -.include .include "../Makefile.cfg" +.include diff --git a/gnu/usr.bin/groff/mm/Makefile b/gnu/usr.bin/groff/mm/Makefile index 90edb96ea8ca..5b85ab7cbb56 100644 --- a/gnu/usr.bin/groff/mm/Makefile +++ b/gnu/usr.bin/groff/mm/Makefile @@ -32,5 +32,5 @@ afterinstall: fi; \ done -.include .include "../Makefile.cfg" +.include diff --git a/gnu/usr.bin/groff/nroff/Makefile b/gnu/usr.bin/groff/nroff/Makefile index 6666718e2e92..83d93c184d98 100644 --- a/gnu/usr.bin/groff/nroff/Makefile +++ b/gnu/usr.bin/groff/nroff/Makefile @@ -6,6 +6,6 @@ afterinstall: install -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ $(.CURDIR)/psroff.sh $(DESTDIR)$(BINDIR)/psroff -.include .include <../../Makefile.inc> .include <../Makefile.cfg> +.include diff --git a/gnu/usr.bin/groff/pfbtops/Makefile b/gnu/usr.bin/groff/pfbtops/Makefile index 4b8c69ec6f63..4033a60e5c73 100644 --- a/gnu/usr.bin/groff/pfbtops/Makefile +++ b/gnu/usr.bin/groff/pfbtops/Makefile @@ -5,6 +5,6 @@ SRCS= pfbtops.c LDADD+= $(LIBGROFF) DPADD+= $(LIBGROFF) -.include .include "../../Makefile.inc" .include "../Makefile.cfg" +.include diff --git a/gnu/usr.bin/groff/pic/Makefile b/gnu/usr.bin/groff/pic/Makefile index a4e55d04cc73..14f7239ce111 100644 --- a/gnu/usr.bin/groff/pic/Makefile +++ b/gnu/usr.bin/groff/pic/Makefile @@ -8,6 +8,6 @@ DPADD+= $(LIBGROFF) $(LIBMATH) CLEANFILES+= pic.cc pic.tab.h -.include .include "../../Makefile.inc" .include "../Makefile.cfg" +.include diff --git a/gnu/usr.bin/groff/psbb/Makefile b/gnu/usr.bin/groff/psbb/Makefile index 64a05f9ccd8a..50c4ab123906 100644 --- a/gnu/usr.bin/groff/psbb/Makefile +++ b/gnu/usr.bin/groff/psbb/Makefile @@ -3,6 +3,6 @@ PROG= psbb SRCS= psbb.c -.include .include "../../Makefile.inc" .include "../Makefile.cfg" +.include diff --git a/gnu/usr.bin/groff/refer/Makefile b/gnu/usr.bin/groff/refer/Makefile index 37a834975e0d..c3ffd1806d5e 100644 --- a/gnu/usr.bin/groff/refer/Makefile +++ b/gnu/usr.bin/groff/refer/Makefile @@ -9,6 +9,6 @@ DPADD+= $(LIBBIB) $(LIBGROFF) $(LIBMATH) CLEANFILES+= label.cc label.tab.h -.include .include "../../Makefile.inc" .include "../Makefile.cfg" +.include diff --git a/gnu/usr.bin/groff/soelim/Makefile b/gnu/usr.bin/groff/soelim/Makefile index 0819ec7b4303..b8af8f0612d3 100644 --- a/gnu/usr.bin/groff/soelim/Makefile +++ b/gnu/usr.bin/groff/soelim/Makefile @@ -6,6 +6,6 @@ CFLAGS+= -I$(.CURDIR)/../include LDADD+= $(LIBGROFF) DPADD+= $(LIBGROFF) -.include .include "../../Makefile.inc" .include "../Makefile.cfg" +.include diff --git a/gnu/usr.bin/groff/tbl/Makefile b/gnu/usr.bin/groff/tbl/Makefile index a58c3e1a7cbe..a1e9343d257b 100644 --- a/gnu/usr.bin/groff/tbl/Makefile +++ b/gnu/usr.bin/groff/tbl/Makefile @@ -6,6 +6,6 @@ CFLAGS+= -I$(.CURDIR)/../include LDADD+= $(LIBGROFF) -lm DPADD+= $(LIBGROFF) $(LIBMATH) -.include .include "../../Makefile.inc" .include "../Makefile.cfg" +.include diff --git a/gnu/usr.bin/groff/tfmtodit/Makefile b/gnu/usr.bin/groff/tfmtodit/Makefile index b3c738407c10..f18794788694 100644 --- a/gnu/usr.bin/groff/tfmtodit/Makefile +++ b/gnu/usr.bin/groff/tfmtodit/Makefile @@ -6,6 +6,6 @@ CFLAGS+= -I$(.CURDIR)/../include LDADD+= $(LIBGROFF) -lm DPADD+= $(LIBGROFF) $(LIBMATH) -.include .include "../../Makefile.inc" .include "../Makefile.cfg" +.include diff --git a/gnu/usr.bin/groff/tmac/Makefile b/gnu/usr.bin/groff/tmac/Makefile index 588988a98e69..a6f51b45c4ed 100644 --- a/gnu/usr.bin/groff/tmac/Makefile +++ b/gnu/usr.bin/groff/tmac/Makefile @@ -24,5 +24,5 @@ afterinstall: install -c -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \ ${.CURDIR}/tmac.an ${DESTDIR}${TMACDIR}/tmac.an.old -.include .include "../Makefile.cfg" +.include diff --git a/gnu/usr.bin/groff/troff/Makefile b/gnu/usr.bin/groff/troff/Makefile index dd6bf623285e..35fba563e68f 100644 --- a/gnu/usr.bin/groff/troff/Makefile +++ b/gnu/usr.bin/groff/troff/Makefile @@ -23,6 +23,6 @@ afterinstall: install -c -o bin -g bin -m 444 $(.CURDIR)/hyphen.us \ $(DESTDIR)$(TMACDIR)/hyphen.us -.include .include "../../Makefile.inc" .include "../Makefile.cfg" +.include