tweaks to pass DESTDIR to subprograms when it is defined in /etc/mk.conf

but is not in the environment.

diff --git a/hack/Makefile b/hack/Makefile
index 66baa586b0528db599ade371c5a50bfc672a932c..b29faea0ed10ef8910535ba37621faf637e3a449 100644 (file)
--- a/hack/Makefile
+++ b/hack/Makefile
@@ -1,6 +1,8 @@
-#      $NetBSD: Makefile,v 1.28 1998/09/12 19:05:48 wrstuden Exp $
+#      $NetBSD: Makefile,v 1.29 1998/12/06 09:06:45 dbj Exp $
 #      @(#)Makefile    8.2 (Berkeley) 4/27/95
 
+.include <bsd.own.mk>
+
 PROG=  hack
 CPPFLAGS+=-I.
 SRCS+= hack.onames.h

diff --git a/phantasia/Makefile b/phantasia/Makefile
index 9f7db6fad08fe257817dc847dfdc568cafa420ef..25b344a8a755225e57821e6baab04df40ff13488 100644 (file)
--- a/phantasia/Makefile
+++ b/phantasia/Makefile
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.16 1998/02/18 22:37:32 jtc Exp $
+#      $NetBSD: Makefile,v 1.17 1998/12/06 09:06:46 dbj Exp $
 #      @(#)Makefile    8.1 (Berkeley) 5/31/93
 
 PROG=  phantasia
@@ -23,8 +23,8 @@ host_phantglobs.o: ${.CURDIR}/phantglobs.c
 setup.o: ${.CURDIR}/setup.c
        ${HOST_COMPILE.c} ${.CURDIR}/setup.c
 
-afterinstall: 
-       ./setup -m ${.CURDIR}/monsters.asc
+afterinstall:
+       DESTDIR=${DESTDIR} ./setup -m ${.CURDIR}/monsters.asc
        chown games:games ${DESTDIR}/var/games/phantasia/*
 
 # Make Phantasia map.  Change the map commands reflect your installation.