From 670bc69e1345f6bb91daa344bf2562446a54f29f Mon Sep 17 00:00:00 2001
From: phk <phk@FreeBSD.org>
Date: Mon, 9 Sep 1996 18:05:29 +0000
Subject: [PATCH] DISTDIR is a reserved variable for make release
 s/DISTDIR/DIST_DIR/g

---
 gnu/usr.bin/groff/Makefile.dev        |  6 +++---
 gnu/usr.bin/groff/Makefile.inc        |  4 ++--
 gnu/usr.bin/groff/Makefile.tty        |  4 ++--
 gnu/usr.bin/groff/devX100-12/Makefile |  4 ++--
 gnu/usr.bin/groff/devX100/Makefile    |  4 ++--
 gnu/usr.bin/groff/devX75-12/Makefile  |  4 ++--
 gnu/usr.bin/groff/devX75/Makefile     |  4 ++--
 gnu/usr.bin/groff/devdvi/Makefile     |  2 +-
 gnu/usr.bin/groff/devlj4/Makefile     |  6 +++---
 gnu/usr.bin/groff/devps/Makefile      | 14 +++++++-------
 gnu/usr.bin/groff/eqn/Makefile        |  2 +-
 gnu/usr.bin/groff/font/Makefile.dev   |  6 +++---
 gnu/usr.bin/groff/font/Makefile.tty   |  4 ++--
 gnu/usr.bin/groff/indxbib/Makefile    |  2 +-
 gnu/usr.bin/groff/libdriver/Makefile  |  2 +-
 gnu/usr.bin/groff/mm/Makefile         |  6 +++---
 gnu/usr.bin/groff/nroff/Makefile      |  4 ++--
 gnu/usr.bin/groff/tmac/Makefile       | 10 +++++-----
 gnu/usr.bin/groff/troff/Makefile      |  4 ++--
 19 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/gnu/usr.bin/groff/Makefile.dev b/gnu/usr.bin/groff/Makefile.dev
index 4d3781fa083b..f60f56cddba7 100644
--- a/gnu/usr.bin/groff/Makefile.dev
+++ b/gnu/usr.bin/groff/Makefile.dev
@@ -2,7 +2,7 @@
 # Client Makefiles define DEV and DEVFILES and provide rules for
 # individual font files
 #
-# $Id$
+# $Id: Makefile.dev,v 2.1 1996/09/08 01:27:11 pst Exp $
 
 .include "../Makefile.cfg"
 
@@ -24,9 +24,9 @@ beforeinstall:: ${.CURDIR}/$f
 	$(INSTALL) -c -o $(FONTOWN) -g $(FONTGRP) -m $(FONTMODE) \
 		${.CURDIR}/$f $(DESTDIR)$(DEVICEDIR)
 .else
-beforeinstall:: $(DISTDIR)/$f
+beforeinstall:: $(DIST_DIR)/$f
 	$(INSTALL) -c -o $(FONTOWN) -g $(FONTGRP) -m $(FONTMODE) \
-		$(DISTDIR)/$f $(DESTDIR)$(DEVICEDIR)
+		$(DIST_DIR)/$f $(DESTDIR)$(DEVICEDIR)
 .endif
 .endfor
 
diff --git a/gnu/usr.bin/groff/Makefile.inc b/gnu/usr.bin/groff/Makefile.inc
index f7bc62ece47e..da9363c84cd2 100644
--- a/gnu/usr.bin/groff/Makefile.inc
+++ b/gnu/usr.bin/groff/Makefile.inc
@@ -1,4 +1,4 @@
 GROFF_DIST?=	${.CURDIR}/../../../../contrib/groff
-DISTDIR=	${GROFF_DIST}/${.CURDIR:T}
+DIST_DIR=	${GROFF_DIST}/${.CURDIR:T}
 
-.PATH: ${DISTDIR}
+.PATH: ${DIST_DIR}
diff --git a/gnu/usr.bin/groff/Makefile.tty b/gnu/usr.bin/groff/Makefile.tty
index 8c0e4b50e1e2..b745c0247f00 100644
--- a/gnu/usr.bin/groff/Makefile.tty
+++ b/gnu/usr.bin/groff/Makefile.tty
@@ -42,7 +42,7 @@ $(FONTS): R.proto
 	     -e "/^internalname/s/B/2/" \
 	     -e "/^internalname/s/I/1/" \
 	     -e "/^internalname .*[^ 0-9]/d" \
-	     ${DISTDIR}/R.proto >$@)
+	     ${DIST_DIR}/R.proto >$@)
 
 DESC: DESC.proto
 	@${ECHO} Making $@
@@ -50,6 +50,6 @@ DESC: DESC.proto
 	    -e "s/^hor .*$$/hor `echo $(RES) / $(CPI) | bc`/" \
 	    -e "s/^vert .*$$/vert `echo $(RES) / $(LPI) | bc`/" \
 	    -e "s/^fonts .*$$/fonts `set $(FONTS); echo $$#` $(FONTS)/" \
-	    ${DISTDIR}/DESC.proto >$@
+	    ${DIST_DIR}/DESC.proto >$@
 
 beforeinstall:: ${DEVFILES}
diff --git a/gnu/usr.bin/groff/devX100-12/Makefile b/gnu/usr.bin/groff/devX100-12/Makefile
index 400d78991965..a505681cd599 100644
--- a/gnu/usr.bin/groff/devX100-12/Makefile
+++ b/gnu/usr.bin/groff/devX100-12/Makefile
@@ -1,7 +1,7 @@
-# $Id$
+# $Id: Makefile,v 1.3 1996/09/08 01:27:19 pst Exp $
 #
 # Generic groff font makefile
 #
 .include "${.CURDIR}/../Makefile.inc"
-.include "${DISTDIR}/Makefile.sub"
+.include "${DIST_DIR}/Makefile.sub"
 .include "${.CURDIR}/../Makefile.dev"
diff --git a/gnu/usr.bin/groff/devX100/Makefile b/gnu/usr.bin/groff/devX100/Makefile
index 400d78991965..e322dea81a92 100644
--- a/gnu/usr.bin/groff/devX100/Makefile
+++ b/gnu/usr.bin/groff/devX100/Makefile
@@ -1,7 +1,7 @@
-# $Id$
+# $Id: Makefile,v 1.3 1996/09/08 01:27:17 pst Exp $
 #
 # Generic groff font makefile
 #
 .include "${.CURDIR}/../Makefile.inc"
-.include "${DISTDIR}/Makefile.sub"
+.include "${DIST_DIR}/Makefile.sub"
 .include "${.CURDIR}/../Makefile.dev"
diff --git a/gnu/usr.bin/groff/devX75-12/Makefile b/gnu/usr.bin/groff/devX75-12/Makefile
index 400d78991965..0a281a3715f0 100644
--- a/gnu/usr.bin/groff/devX75-12/Makefile
+++ b/gnu/usr.bin/groff/devX75-12/Makefile
@@ -1,7 +1,7 @@
-# $Id$
+# $Id: Makefile,v 1.3 1996/09/08 01:27:23 pst Exp $
 #
 # Generic groff font makefile
 #
 .include "${.CURDIR}/../Makefile.inc"
-.include "${DISTDIR}/Makefile.sub"
+.include "${DIST_DIR}/Makefile.sub"
 .include "${.CURDIR}/../Makefile.dev"
diff --git a/gnu/usr.bin/groff/devX75/Makefile b/gnu/usr.bin/groff/devX75/Makefile
index 400d78991965..dab8bfd7c435 100644
--- a/gnu/usr.bin/groff/devX75/Makefile
+++ b/gnu/usr.bin/groff/devX75/Makefile
@@ -1,7 +1,7 @@
-# $Id$
+# $Id: Makefile,v 1.3 1996/09/08 01:27:21 pst Exp $
 #
 # Generic groff font makefile
 #
 .include "${.CURDIR}/../Makefile.inc"
-.include "${DISTDIR}/Makefile.sub"
+.include "${DIST_DIR}/Makefile.sub"
 .include "${.CURDIR}/../Makefile.dev"
diff --git a/gnu/usr.bin/groff/devdvi/Makefile b/gnu/usr.bin/groff/devdvi/Makefile
index 312c8d28771f..788b4f024a72 100644
--- a/gnu/usr.bin/groff/devdvi/Makefile
+++ b/gnu/usr.bin/groff/devdvi/Makefile
@@ -12,7 +12,7 @@ DEVFILES=	$(FONTFILES)
 .include "../Makefile.inc"
 
 DESC:	DESC.in
-	cat ${DISTDIR}/DESC.in >DESC
+	cat ${DIST_DIR}/DESC.in >DESC
 	test -z '${DVIPRINT}' || echo print '${DVIPRINT}' >>DESC
 
 .include "../Makefile.dev"
diff --git a/gnu/usr.bin/groff/devlj4/Makefile b/gnu/usr.bin/groff/devlj4/Makefile
index d14a2377bf9d..94d19f59a591 100644
--- a/gnu/usr.bin/groff/devlj4/Makefile
+++ b/gnu/usr.bin/groff/devlj4/Makefile
@@ -14,7 +14,7 @@ DESC: DESC.in
 	-rm -f DESC
 	echo "res $(LJ4RES)" >DESC
 	echo "unitwidth `expr 7620000 / $(LJ4RES)`" >>DESC
-	cat ${DISTDIR}/DESC.in >>DESC
+	cat ${DIST_DIR}/DESC.in >>DESC
 	if test "$(PAGE)" = A4; then \
 	  echo "papersize a4" >>DESC; \
 	else \
@@ -23,8 +23,8 @@ DESC: DESC.in
 	test -z '$(LJ4PRINT)' || echo print '$(LJ4PRINT)' >>DESC
 
 fonts:	DESC
-	$(MAKE) -f ${DISTDIR}/generate/Makefile \
-		srcdir=${DISTDIR}/generate DESC=${DISTDIR}/DESC.in \
+	$(MAKE) -f ${DIST_DIR}/generate/Makefile \
+		srcdir=${DIST_DIR}/generate DESC=${DIST_DIR}/DESC.in \
 	  	HPFTODIT=${.CURDIR}/../hpftodit/hpftodit
 
 .include "../Makefile.dev"
diff --git a/gnu/usr.bin/groff/devps/Makefile b/gnu/usr.bin/groff/devps/Makefile
index 1a49ef4ca8e3..fd8cfc09ff71 100644
--- a/gnu/usr.bin/groff/devps/Makefile
+++ b/gnu/usr.bin/groff/devps/Makefile
@@ -16,7 +16,7 @@ CLEANFILES+=	DESC ${PSFILES}
 
 DESC: DESC.in
 	-rm -f DESC
-	cat ${DISTDIR}/DESC.in >DESC
+	cat ${DIST_DIR}/DESC.in >DESC
 	echo broken ${BROKEN_SPOOLER_FLAGS} >>DESC
 	if test "${PAGE}" = A4; then \
 	  echo "paperlength 841890" >>DESC; \
@@ -27,14 +27,14 @@ DESC: DESC.in
 
 ${PSFILES}:
 	-rm -f $@
-	sed -f ${DISTDIR}/psstrip.sed $? >$@
+	sed -f ${DIST_DIR}/psstrip.sed $? >$@
 
 fonts: DESC
-	${MAKE} -f ${DISTDIR}/generate/Makefile \
-	  srcdir=${DISTDIR}/generate DESC=${DISTDIR}/DESC.in
+	${MAKE} -f ${DIST_DIR}/generate/Makefile \
+	  srcdir=${DIST_DIR}/generate DESC=${DIST_DIR}/DESC.in
 
-prologue:	${DISTDIR}/prologue.ps
-zapfdr.pfa:	${DISTDIR}/zapfdr.ps
-symbolsl.pfa:	${DISTDIR}/symbolsl.ps
+prologue:	${DIST_DIR}/prologue.ps
+zapfdr.pfa:	${DIST_DIR}/zapfdr.ps
+symbolsl.pfa:	${DIST_DIR}/symbolsl.ps
 
 .include "../Makefile.dev"
diff --git a/gnu/usr.bin/groff/eqn/Makefile b/gnu/usr.bin/groff/eqn/Makefile
index e098130f6a14..1de1e4ce4cc4 100644
--- a/gnu/usr.bin/groff/eqn/Makefile
+++ b/gnu/usr.bin/groff/eqn/Makefile
@@ -12,7 +12,7 @@ MANDEPEND=	eqn.1
 CLEANFILES+=	eqn.cc eqn.tab.h neqn ${MANDEPEND}
 
 neqn:
-	sed -e 's/@g@/${g}/g' ${DISTDIR}/neqn.sh > neqn
+	sed -e 's/@g@/${g}/g' ${DIST_DIR}/neqn.sh > neqn
 
 afterinstall:	neqn
 	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} neqn \
diff --git a/gnu/usr.bin/groff/font/Makefile.dev b/gnu/usr.bin/groff/font/Makefile.dev
index 4d3781fa083b..f60f56cddba7 100644
--- a/gnu/usr.bin/groff/font/Makefile.dev
+++ b/gnu/usr.bin/groff/font/Makefile.dev
@@ -2,7 +2,7 @@
 # Client Makefiles define DEV and DEVFILES and provide rules for
 # individual font files
 #
-# $Id$
+# $Id: Makefile.dev,v 2.1 1996/09/08 01:27:11 pst Exp $
 
 .include "../Makefile.cfg"
 
@@ -24,9 +24,9 @@ beforeinstall:: ${.CURDIR}/$f
 	$(INSTALL) -c -o $(FONTOWN) -g $(FONTGRP) -m $(FONTMODE) \
 		${.CURDIR}/$f $(DESTDIR)$(DEVICEDIR)
 .else
-beforeinstall:: $(DISTDIR)/$f
+beforeinstall:: $(DIST_DIR)/$f
 	$(INSTALL) -c -o $(FONTOWN) -g $(FONTGRP) -m $(FONTMODE) \
-		$(DISTDIR)/$f $(DESTDIR)$(DEVICEDIR)
+		$(DIST_DIR)/$f $(DESTDIR)$(DEVICEDIR)
 .endif
 .endfor
 
diff --git a/gnu/usr.bin/groff/font/Makefile.tty b/gnu/usr.bin/groff/font/Makefile.tty
index 8c0e4b50e1e2..b745c0247f00 100644
--- a/gnu/usr.bin/groff/font/Makefile.tty
+++ b/gnu/usr.bin/groff/font/Makefile.tty
@@ -42,7 +42,7 @@ $(FONTS): R.proto
 	     -e "/^internalname/s/B/2/" \
 	     -e "/^internalname/s/I/1/" \
 	     -e "/^internalname .*[^ 0-9]/d" \
-	     ${DISTDIR}/R.proto >$@)
+	     ${DIST_DIR}/R.proto >$@)
 
 DESC: DESC.proto
 	@${ECHO} Making $@
@@ -50,6 +50,6 @@ DESC: DESC.proto
 	    -e "s/^hor .*$$/hor `echo $(RES) / $(CPI) | bc`/" \
 	    -e "s/^vert .*$$/vert `echo $(RES) / $(LPI) | bc`/" \
 	    -e "s/^fonts .*$$/fonts `set $(FONTS); echo $$#` $(FONTS)/" \
-	    ${DISTDIR}/DESC.proto >$@
+	    ${DIST_DIR}/DESC.proto >$@
 
 beforeinstall:: ${DEVFILES}
diff --git a/gnu/usr.bin/groff/indxbib/Makefile b/gnu/usr.bin/groff/indxbib/Makefile
index 5c1aa4908429..6f26df5b9bd9 100644
--- a/gnu/usr.bin/groff/indxbib/Makefile
+++ b/gnu/usr.bin/groff/indxbib/Makefile
@@ -15,7 +15,7 @@ CLEANFILES+=	${MANDEPEND}
 #
 afterinstall:
 	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 \
-		${DISTDIR}/eign ${DESTDIR}${SHAREDIR}/dict
+		${DIST_DIR}/eign ${DESTDIR}${SHAREDIR}/dict
 
 .include "../Makefile.cfg"
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/libdriver/Makefile b/gnu/usr.bin/groff/libdriver/Makefile
index 368c16ce4b6e..f1522d14edeb 100644
--- a/gnu/usr.bin/groff/libdriver/Makefile
+++ b/gnu/usr.bin/groff/libdriver/Makefile
@@ -2,7 +2,7 @@
 
 LIB=		driver
 SRCS=		input.cc printer.cc
-CFLAGS+=	-I$(DISTDIR)/../include
+CFLAGS+=	-I$(DIST_DIR)/../include
 
 NOMAN=		noman
 NOPROFILE=	noprofile
diff --git a/gnu/usr.bin/groff/mm/Makefile b/gnu/usr.bin/groff/mm/Makefile
index d5a455857b93..8521e31e73f3 100644
--- a/gnu/usr.bin/groff/mm/Makefile
+++ b/gnu/usr.bin/groff/mm/Makefile
@@ -14,9 +14,9 @@ CLEANFILES+=	${MANDEPEND}
 
 afterinstall:
 	${INSTALL} -c -o $(TMACOWN) -g $(TMACGRP) -m $(TMACMODE) \
-		${DISTDIR}/tmac.m $(DESTDIR)$(TMACDIR)/tmac.m
+		${DIST_DIR}/tmac.m $(DESTDIR)$(TMACDIR)/tmac.m
 	${INSTALL} -c -o $(TMACOWN) -g $(TMACGRP) -m $(TMACMODE) \
-		${DISTDIR}/tmac.m $(DESTDIR)$(TMACDIR)/tmac.mse
+		${DIST_DIR}/tmac.m $(DESTDIR)$(TMACDIR)/tmac.mse
 
 	test -d $(DESTDIR)$(TMACDIR)/mm || mkdir $(DESTDIR)$(TMACDIR)/mm
 	chown $(TMACOWN).$(TMACGRP) $(DESTDIR)$(TMACDIR)/mm
@@ -24,7 +24,7 @@ afterinstall:
 
 	for f in $(FILES); do \
 		$(INSTALL) -c -o $(TMACOWN) -g $(TMACGRP) -m $(TMACMODE) \
-			${DISTDIR}/mm/$$f $(DESTDIR)$(TMACDIR)/mm/$$f; \
+			${DIST_DIR}/mm/$$f $(DESTDIR)$(TMACDIR)/mm/$$f; \
 	done
 	for f in $(LOCALE); do \
 		test -f $(DESTDIR)$(TMACDIR)/mm/$$f || \
diff --git a/gnu/usr.bin/groff/nroff/Makefile b/gnu/usr.bin/groff/nroff/Makefile
index fac43ad72ddc..d08fc866f3d9 100644
--- a/gnu/usr.bin/groff/nroff/Makefile
+++ b/gnu/usr.bin/groff/nroff/Makefile
@@ -5,9 +5,9 @@ CLEANFILES+=	${MANDEPEND}
 
 afterinstall:
 	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
-		$(DISTDIR)/nroff.sh $(DESTDIR)$(BINDIR)/nroff
+		$(DIST_DIR)/nroff.sh $(DESTDIR)$(BINDIR)/nroff
 	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
-		$(DISTDIR)/psroff.sh $(DESTDIR)$(BINDIR)/psroff
+		$(DIST_DIR)/psroff.sh $(DESTDIR)$(BINDIR)/psroff
 
 .include <../Makefile.cfg>
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/tmac/Makefile b/gnu/usr.bin/groff/tmac/Makefile
index 61913a0be526..2a084f8f9fab 100644
--- a/gnu/usr.bin/groff/tmac/Makefile
+++ b/gnu/usr.bin/groff/tmac/Makefile
@@ -23,26 +23,26 @@ MDOCFILES=	doc-common doc-ditroff doc-nroff doc-syms
 beforeinstall:
 	for f in ${FILES}; do \
 		${INSTALL} -c -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \
-			${DISTDIR}/$$f ${DESTDIR}${TMACDIR}; \
+			${DIST_DIR}/$$f ${DESTDIR}${TMACDIR}; \
 	done
-	sed -f ${DISTDIR}/strip.sed ${DISTDIR}/tmac.an >tmac.groff_an
+	sed -f ${DIST_DIR}/strip.sed ${DIST_DIR}/tmac.an >tmac.groff_an
 	${INSTALL} -c -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \
 		tmac.groff_an ${DESTDIR}${TMACDIR}
 	for f in ${STRIPFILES}; do \
 		rm -f temp; \
-	  	sed -f ${DISTDIR}/strip.sed ${DISTDIR}/$$f >temp; \
+	  	sed -f ${DIST_DIR}/strip.sed ${DIST_DIR}/$$f >temp; \
 		${INSTALL} -c -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \
 			temp ${DESTDIR}${TMACDIR}/$$f; \
 	done
 	for f in ${MDOCFILES}; do \
 		rm -f temp; \
-		sed -f ${DISTDIR}/strip.sed ${DISTDIR}/$$f >temp; \
+		sed -f ${DIST_DIR}/strip.sed ${DIST_DIR}/$$f >temp; \
 		${INSTALL} -c -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \
 			temp ${DESTDIR}${MDOCDIR}/$$f; \
 	done
 	test -f ${DESTDIR}${TMACDIR}/man.local || \
 		${INSTALL} -c -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \
-			${DISTDIR}/man.local ${DESTDIR}${TMACDIR}
+			${DIST_DIR}/man.local ${DESTDIR}${TMACDIR}
 
 .include "../Makefile.cfg"
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/troff/Makefile b/gnu/usr.bin/groff/troff/Makefile
index 5556380e2508..bdba81ec014f 100644
--- a/gnu/usr.bin/groff/troff/Makefile
+++ b/gnu/usr.bin/groff/troff/Makefile
@@ -19,9 +19,9 @@ majorminor.cc: ${GROFF_DIST}/VERSION
 	\"`sed -e 's/^[^.]*\.\([0-9]*\).*$$/\1/' ${GROFF_DIST}/VERSION`\"\; >>$@
 
 afterinstall:
-	${INSTALL} -c -o bin -g bin -m 444 ${DISTDIR}/hyphen.us \
+	${INSTALL} -c -o bin -g bin -m 444 ${DIST_DIR}/hyphen.us \
 		${DESTDIR}${tmacdir}/hyphen.us
-	${INSTALL} -c -o bin -g bin -m 444 ${DISTDIR}/hyphen.us-ru \
+	${INSTALL} -c -o bin -g bin -m 444 ${DIST_DIR}/hyphen.us-ru \
 		${DESTDIR}${tmacdir}/hyphen.us-ru
 
 .include "../Makefile.cfg"