Fix some lossage that was caused bsd.prog.mk to be included twice.

1993-07-18 12:46:09 +00:00 · 1993-07-18 12:46:09 +00:00 · addf74bf1e
commit addf74bf1e
parent 34dfeef26f
27 changed files with 26 additions and 28 deletions
--- 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 <bsd.prog.mk>
--- 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 <bsd.prog.mk>
 .include "../../Makefile.inc"
 .include "../Makefile.cfg"
+.include <bsd.prog.mk>
--- 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 <bsd.prog.mk>
 .include <../../Makefile.inc>
 .include <../Makefile.cfg>
+.include <bsd.prog.mk>
--- 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 <bsd.prog.mk>
 .include "../../Makefile.inc"
 .include "../Makefile.cfg"
+.include <bsd.prog.mk>
--- 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 <bsd.prog.mk>
 .include "../../Makefile.inc"
 .include "../Makefile.cfg"
+.include <bsd.prog.mk>
--- 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 <bsd.prog.mk>
 .include "../../Makefile.inc"
 .include "../Makefile.cfg"
+.include <bsd.prog.mk>
--- 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 <bsd.prog.mk>
 .include <../../Makefile.inc>
+.include <bsd.prog.mk>
--- 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 <bsd.prog.mk>
 .include "../../Makefile.inc"
 .include "../Makefile.cfg"
+.include <bsd.prog.mk>
--- 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 <bsd.prog.mk>
 .include "../../Makefile.inc"
 .include "../Makefile.cfg"
+.include <bsd.prog.mk>
--- 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 <bsd.prog.mk>
 .include "../../Makefile.inc"
 .include "../Makefile.cfg"
+.include <bsd.prog.mk>
--- a/gnu/usr.bin/groff/libbib/Makefile
+++ b/gnu/usr.bin/groff/libbib/Makefile
@ -9,5 +9,5 @@ NOPROFILE=	noprofile

 install:

-.include <bsd.lib.mk>
 .include "../Makefile.cfg"
+.include <bsd.lib.mk>
--- a/gnu/usr.bin/groff/libdriver/Makefile
+++ b/gnu/usr.bin/groff/libdriver/Makefile
@ -9,5 +9,5 @@ NOPROFILE=	noprofile

 install:

-.include <bsd.lib.mk>
 .include "../Makefile.cfg"
+.include <bsd.lib.mk>
--- a/gnu/usr.bin/groff/libgroff/Makefile
+++ b/gnu/usr.bin/groff/libgroff/Makefile
@ -19,5 +19,5 @@ version.cc: $(.CURDIR)/../VERSION

 install:

-.include <bsd.lib.mk>
 .include "../Makefile.cfg"
+.include <bsd.lib.mk>
--- 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 <bsd.prog.mk>
 .include "../../Makefile.inc"
 .include "../Makefile.cfg"
+.include <bsd.prog.mk>
--- 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 <bsd.prog.mk>
 .include "../../Makefile.inc"
 .include "../Makefile.cfg"
+.include <bsd.prog.mk>
--- 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 <bsd.prog.mk>
 .include "../Makefile.cfg"
+.include <bsd.prog.mk>
--- a/gnu/usr.bin/groff/mm/Makefile
+++ b/gnu/usr.bin/groff/mm/Makefile
@ -32,5 +32,5 @@ afterinstall:
 		fi; \
 	done

-.include <bsd.prog.mk>
 .include "../Makefile.cfg"
+.include <bsd.prog.mk>
--- 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 <bsd.prog.mk>
 .include <../../Makefile.inc>
 .include <../Makefile.cfg>
+.include <bsd.prog.mk>
--- 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 <bsd.prog.mk>
 .include "../../Makefile.inc"
 .include "../Makefile.cfg"
+.include <bsd.prog.mk>
--- 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 <bsd.prog.mk>
 .include "../../Makefile.inc"
 .include "../Makefile.cfg"
+.include <bsd.prog.mk>
--- a/gnu/usr.bin/groff/psbb/Makefile
+++ b/gnu/usr.bin/groff/psbb/Makefile
@ -3,6 +3,6 @@
 PROG=		psbb
 SRCS=		psbb.c

-.include <bsd.prog.mk>
 .include "../../Makefile.inc"
 .include "../Makefile.cfg"
+.include <bsd.prog.mk>
--- 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 <bsd.prog.mk>
 .include "../../Makefile.inc"
 .include "../Makefile.cfg"
+.include <bsd.prog.mk>
--- 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 <bsd.prog.mk>
 .include "../../Makefile.inc"
 .include "../Makefile.cfg"
+.include <bsd.prog.mk>
--- 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 <bsd.prog.mk>
 .include "../../Makefile.inc"
 .include "../Makefile.cfg"
+.include <bsd.prog.mk>
--- 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 <bsd.prog.mk>
 .include "../../Makefile.inc"
 .include "../Makefile.cfg"
+.include <bsd.prog.mk>
--- 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 <bsd.prog.mk>
 .include "../Makefile.cfg"
+.include <bsd.prog.mk>
--- 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 <bsd.prog.mk>
 .include "../../Makefile.inc"
 .include "../Makefile.cfg"
+.include <bsd.prog.mk>