From d4fc452126cfb5931b27328e3cb0196d46e00cd5 Mon Sep 17 00:00:00 2001 From: sommerfeld Date: Sat, 30 Dec 2000 17:51:26 +0000 Subject: ${PRINTOBJDIR}ify --- backgammon/Makefile.inc | 6 +++--- boggle/Makefile | 11 +++++------ fortune/datfiles/Makefile | 6 +++--- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/backgammon/Makefile.inc b/backgammon/Makefile.inc index 94aed0c4..427d624d 100644 --- a/backgammon/Makefile.inc +++ b/backgammon/Makefile.inc @@ -1,8 +1,8 @@ -# $NetBSD: Makefile.inc,v 1.5 1998/02/02 14:14:55 christos Exp $ +# $NetBSD: Makefile.inc,v 1.6 2000/12/30 17:51:26 sommerfeld Exp $ -LIBCOMMON != cd ${.CURDIR}/../common_source;\ - printf "xxx: .MAKE\n\t@echo \$${.OBJDIR}\n" | ${MAKE} -s -f- +.include +LIBCOMMON != cd ${.CURDIR}/../common_source; ${PRINTOBJDIR} CPPFLAGS+=-DV7 -I${.CURDIR}/../common_source DPADD+= ${LIBCOMMON}/libcommon.a ${LIBTERMCAP} LDADD+= -L${LIBCOMMON} -lcommon -ltermcap diff --git a/boggle/Makefile b/boggle/Makefile index 3a5f86c7..4543e37f 100644 --- a/boggle/Makefile +++ b/boggle/Makefile @@ -1,14 +1,14 @@ -# $NetBSD: Makefile,v 1.16 2000/01/23 22:08:53 mycroft Exp $ +# $NetBSD: Makefile,v 1.17 2000/12/30 17:51:26 sommerfeld Exp $ # @(#)Makefile 8.1 (Berkeley) 6/11/93 .include SUBDIR= boggle mkdict mkindex -MKDICT!=cd $(.CURDIR)/mkdict; \ - printf "xxx: .MAKE\n\t@echo \$${.OBJDIR}/mkdict\n" | ${MAKE} -s -f- -MKINDEX!=cd $(.CURDIR)/mkindex; \ - printf "xxx: .MAKE\n\t@echo \$${.OBJDIR}/mkindex\n" | ${MAKE} -s -f- +MKDICTDIR!= cd $(.CURDIR)/mkdict; ${PRINTOBJDIR} +MKDICT=${MKDICTDIR}/mkdict +MKINDEXDIR!= cd $(.CURDIR)/mkindex; ${PRINTOBJDIR} +MKINDEX=${MKINDEXDIR}/mkindex WORDS=${.CURDIR}/../../share/dict/web2 DICTFILES=${.OBJDIR}/dictionary ${.OBJDIR}/dictindex .if ${MKSHARE} != "no" @@ -24,7 +24,6 @@ ${MKDICT}: ${MKINDEX}: @cd ${.CURDIR}/mkindex && ${MAKE} - ${.OBJDIR}/dictionary: ${WORDS} ${MKDICT} rm -f ${.TARGET} diff --git a/fortune/datfiles/Makefile b/fortune/datfiles/Makefile index c457a218..dae9b484 100644 --- a/fortune/datfiles/Makefile +++ b/fortune/datfiles/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2000/08/17 16:54:28 abs Exp $ +# $NetBSD: Makefile,v 1.30 2000/12/30 17:51:26 sommerfeld Exp $ # @(#)Makefile 8.2 (Berkeley) 4/19/94 .include # for INSTALL_OFFENSIVE_FORTUNES @@ -23,8 +23,8 @@ TYPE= fake CLEANFILES+=${DATFILES} limerick-o -STRFILE!=cd $(.CURDIR)/../strfile; \ - printf "xxx: .MAKE\n\t@echo \$${.OBJDIR}/strfile\n" | ${MAKE} -s -f- +STRFILEDIR!=cd $(.CURDIR)/../strfile; ${PRINTOBJDIR} +STRFILE=${STRFILEDIR}/strfile .if ${MKSHARE} != "no" FILES=${SRCFILES} ${DATFILES} -- cgit v1.2.3-56-ge451