DISTDIR is a reserved variable for make release

s/DISTDIR/DIST_DIR/g
This commit is contained in:
phk 1996-09-09 18:05:29 +00:00
parent f986f295c0
commit 670bc69e13
19 changed files with 46 additions and 46 deletions

View File

@ -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

View File

@ -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}

View File

@ -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}

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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 \

View File

@ -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

View File

@ -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}

View File

@ -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>

View File

@ -2,7 +2,7 @@
LIB= driver
SRCS= input.cc printer.cc
CFLAGS+= -I$(DISTDIR)/../include
CFLAGS+= -I$(DIST_DIR)/../include
NOMAN= noman
NOPROFILE= noprofile

View File

@ -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 || \

View File

@ -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>

View File

@ -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>

View File

@ -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"