From d9bf9ebd1c4d0cf9334ca40c2f585d4d17f70bdf Mon Sep 17 00:00:00 2001 From: jlam Date: Tue, 28 Jan 2003 22:03:00 +0000 Subject: Instead of including bsd.pkg.install.mk directly in a package Makefile, have it be automatically included by bsd.pkg.mk if USE_PKGINSTALL is set to "YES". This enforces the requirement that bsd.pkg.install.mk be included at the end of a package Makefile. Idea suggested by Julio M. Merino Vidal . --- emulators/xmame/Makefile | 5 +++-- emulators/xmess/Makefile | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'emulators') diff --git a/emulators/xmame/Makefile b/emulators/xmame/Makefile index 8082e972835..cd6fa38e28f 100644 --- a/emulators/xmame/Makefile +++ b/emulators/xmame/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.88 2003/01/13 19:06:27 kristerw Exp $ +# $NetBSD: Makefile,v 1.89 2003/01/28 22:03:17 jlam Exp $ # DISTNAME= xmame-0.62.2 @@ -16,6 +16,7 @@ NO_SRC_ON_CDROM= ${RESTRICTED} NO_BIN_ON_CDROM= ${RESTRICTED} USE_BUILDLINK2= YES +USE_PKGINSTALL= YES USE_X11BASE= YES USE_GMAKE= YES MAKEFILE= makefile.unix @@ -106,5 +107,5 @@ do-install: .include "../../audio/esound/buildlink2.mk" .include "../../graphics/xpm/buildlink2.mk" -.include "../../mk/bsd.pkg.install.mk" + .include "../../mk/bsd.pkg.mk" diff --git a/emulators/xmess/Makefile b/emulators/xmess/Makefile index 0851a37c952..9aa0d6eeff2 100644 --- a/emulators/xmess/Makefile +++ b/emulators/xmess/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2003/01/13 19:35:42 kristerw Exp $ +# $NetBSD: Makefile,v 1.31 2003/01/28 22:03:17 jlam Exp $ # DISTNAME= xmame-0.62.2 @@ -16,6 +16,7 @@ NO_SRC_ON_CDROM= ${RESTRICTED} NO_BIN_ON_CDROM= ${RESTRICTED} USE_BUILDLINK2= YES +USE_PKGINSTALL= YES USE_X11BASE= YES USE_GMAKE= YES MAKEFILE= makefile.unix @@ -106,5 +107,5 @@ do-install: .include "../../audio/esound/buildlink2.mk" .include "../../graphics/xpm/buildlink2.mk" -.include "../../mk/bsd.pkg.install.mk" + .include "../../mk/bsd.pkg.mk" -- cgit v1.2.3