From 1b7292f8cc0d8640c99543990f0f17ab7fb10e49 Mon Sep 17 00:00:00 2001 From: jmc Date: Thu, 24 Apr 2003 22:14:36 +0000 Subject: Rework to not do configure/patch rules if NO_CONFIGURE or NO_BUILD is set --- games/nethack-lib/Makefile.common | 6 +++++- games/nethack/Makefile | 9 ++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) (limited to 'games') diff --git a/games/nethack-lib/Makefile.common b/games/nethack-lib/Makefile.common index 8834fc24e99..cb26f3d4981 100644 --- a/games/nethack-lib/Makefile.common +++ b/games/nethack-lib/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.10 2003/03/29 12:41:06 jmmv Exp $ +# $NetBSD: Makefile.common,v 1.11 2003/04/24 22:14:36 jmc Exp $ # NETHACK_BASEVER= 3.4.1 @@ -20,9 +20,12 @@ CONFIGURE_SCRIPT= ./sys/unix/setup.sh .include "../../mk/bsd.prefs.mk" +.if !defined(NO_CONFIGURE) pre-configure: @${CHMOD} 755 ${WRKSRC}/sys/unix/setup.sh +.endif +.if !defined(NO_BUILD) post-patch: @${MV} ${WRKSRC}/include/config.h ${WRKSRC}/config.h-pre @${SED} -e 's@XXXPREFIXXXX@${PREFIX}@g' \ @@ -30,3 +33,4 @@ post-patch: | ${AWK} '{ print $$1 }'`'|g' \ < ${WRKSRC}/config.h-pre > ${WRKSRC}/include/config.h @${RM} -f ${WRKSRC}/config.h-pre +.endif diff --git a/games/nethack/Makefile b/games/nethack/Makefile index e1715407d25..00e6910afaa 100644 --- a/games/nethack/Makefile +++ b/games/nethack/Makefile @@ -1,4 +1,8 @@ -# $NetBSD: Makefile,v 1.12 2003/03/28 21:14:21 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2003/04/24 22:14:37 jmc Exp $ + +# Needed so configure/patch rules don't get pulled in +NO_BUILD= yes +NO_CONFIGURE= yes .include "../nethack-lib/Makefile.common" @@ -16,9 +20,8 @@ DEPENDS+= nethack-qt-${NETHACK_VERSION}:../nethack-qt USE_X11= yes EXTRACT_ONLY= # empty NO_CHECKSUM= yes -NO_BUILD= yes -NO_CONFIGURE= yes do-install: # empty +do-patch: # empty .include "../../mk/bsd.pkg.mk" -- cgit v1.2.3