Use .OBJDIR for auxiliary programs.

diff --git a/fortune/datfiles/Makefile b/fortune/datfiles/Makefile
index 0552ca39319cae78189b94055d5c83bbb9cfdb80..5ef916d72a0058c40a96d26b266887a4d324a1ef 100644 (file)
--- a/fortune/datfiles/Makefile
+++ b/fortune/datfiles/Makefile
@@ -1,5 +1,5 @@
 #      from: @(#)Makefile      5.2 (Berkeley) 5/6/91
 #      from: @(#)Makefile      5.2 (Berkeley) 5/6/91

-#      $Id: Makefile,v 1.7 1993/09/30 23:57:08 jtc Exp $
+#      $Id: Makefile,v 1.8 1994/01/04 21:40:31 pk Exp $

 
 #
 # set `OBSCENE' to "real" to have obscene fortunes installed,
 
 #
 # set `OBSCENE' to "real" to have obscene fortunes installed,


@@ -14,6 +14,9 @@ DATFILES= ${NORMDAT} ${OBSDAT}
 
 CLEANFILES+=${DATFILES}
 
 
 CLEANFILES+=${DATFILES}
 

+STRFILE!=cd $(.CURDIR)/../strfile; \
+       printf "xxx:\n\techo \$${.OBJDIR}/strfile\n" | make -r -s -f - xxx
+

 all: ${DATFILES}
 
 install:
 all: ${DATFILES}
 
 install:


@@ -27,11 +30,9 @@ install:
                ${DESTDIR}/usr/share/games/fortune/${OBSDAT:R})
 
 fortunes-o.dat: ${.TARGET:R}.${OBSCENE}.rot13
                ${DESTDIR}/usr/share/games/fortune/${OBSDAT:R})
 
 fortunes-o.dat: ${.TARGET:R}.${OBSCENE}.rot13

-       ${.CURDIR}/../strfile/obj/strfile -rsx \
-           ${.CURDIR}/${.TARGET:R}.${OBSCENE}.rot13 ${.TARGET}
+       ${STRFILE} -rsx ${.CURDIR}/${.TARGET:R}.${OBSCENE}.rot13 ${.TARGET}

 
 fortunes.dat startrek.dat zippy.dat: ${.TARGET:R}
 
 fortunes.dat startrek.dat zippy.dat: ${.TARGET:R}

-       ${.CURDIR}/../strfile/obj/strfile -rs \
-           ${.CURDIR}/${.TARGET:R} ${.TARGET}
+       ${STRFILE} -rs ${.CURDIR}/${.TARGET:R} ${.TARGET}

 
 .include <bsd.prog.mk>
 
 .include <bsd.prog.mk>

diff --git a/hack/Makefile b/hack/Makefile
index 43488b81ed665abaea92bfde0748d432b4610831..5c6aa7ce2ce31cecd55cd6a792f28b1a8068ccae 100644 (file)
--- a/hack/Makefile
+++ b/hack/Makefile
@@ -1,5 +1,5 @@
 #      from: @(#)Makefile      5.10 (Berkeley) 12/8/90
 #      from: @(#)Makefile      5.10 (Berkeley) 12/8/90

-#      $Id: Makefile,v 1.11 1993/12/02 03:11:32 mycroft Exp $
+#      $Id: Makefile,v 1.12 1994/01/04 21:41:07 pk Exp $

 
 PROG=  hack
 CFLAGS+=-I.
 
 PROG=  hack
 CFLAGS+=-I.


@@ -24,7 +24,7 @@ CLEANFILES+=hack.onames.h makedefs
 ${PROG}: hack.onames.h
 
 hack.onames.h: makedefs def.objects.h
 ${PROG}: hack.onames.h
 
 hack.onames.h: makedefs def.objects.h

-       ./makedefs ${.CURDIR}/def.objects.h > hack.onames.h
+       ${.OBJDIR}/makedefs ${.CURDIR}/def.objects.h > hack.onames.h

 
 makedefs: makedefs.c
        ${CC} ${CFLAGS} ${LDFLAGS} ${LDSTATIC} -o ${.TARGET} ${.CURDIR}/${.PREFIX}.c ${LDADD}
 
 makedefs: makedefs.c
        ${CC} ${CFLAGS} ${LDFLAGS} ${LDSTATIC} -o ${.TARGET} ${.CURDIR}/${.PREFIX}.c ${LDADD}

diff --git a/monop/Makefile b/monop/Makefile
index b9803504eae29d97bca747f74635a13fef858edd..5dc98ae9de34516bf77d20ce32e08fc3b1ea8dd6 100644 (file)
--- a/monop/Makefile
+++ b/monop/Makefile
@@ -1,5 +1,5 @@
 #      from: @(#)Makefile      5.8 (Berkeley) 9/2/92
 #      from: @(#)Makefile      5.8 (Berkeley) 9/2/92

-#      $Id: Makefile,v 1.9 1993/11/08 04:45:57 cgd Exp $
+#      $Id: Makefile,v 1.10 1994/01/04 21:41:36 pk Exp $

 
 PROG=  monop
 SRCS=  monop.c cards.c execute.c getinp.c houses.c jail.c misc.c morg.c \
 
 PROG=  monop
 SRCS=  monop.c cards.c execute.c getinp.c houses.c jail.c misc.c morg.c \


@@ -13,7 +13,7 @@ CLEANFILES+=initdeck cards.pck
 monop: cards.pck
 
 cards.pck: initdeck
 monop: cards.pck
 
 cards.pck: initdeck

-       ./initdeck ${.CURDIR}/cards.inp
+       ${.OBJDIR}/initdeck ${.CURDIR}/cards.inp

 
 initdeck: initdeck.c
        ${CC} ${CFLAGS} ${LDFLAGS} ${LDSTATIC} -o ${.TARGET} ${.CURDIR}/initdeck.c ${LDADD}
 
 initdeck: initdeck.c
        ${CC} ${CFLAGS} ${LDFLAGS} ${LDSTATIC} -o ${.TARGET} ${.CURDIR}/initdeck.c ${LDADD}