From d9d8a581de8b2d79af0b94cf58be87f54a5a329c Mon Sep 17 00:00:00 2001 From: seb Date: Thu, 12 Feb 2004 08:55:33 +0000 Subject: [PATCH] Make pathnames listed in CONFIG_STATUS_OVERRIDE relative to WRKSRC. --- devel/gtexinfo/Makefile | 4 ++-- games/genecys-client/Makefile | 4 ++-- mk/bsd.pkg.mk | 10 +++++----- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/devel/gtexinfo/Makefile b/devel/gtexinfo/Makefile index 94d286c5a376..3486f2f7f72d 100644 --- a/devel/gtexinfo/Makefile +++ b/devel/gtexinfo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.47 2004/02/11 00:47:20 jlam Exp $ +# $NetBSD: Makefile,v 1.48 2004/02/12 08:55:33 seb Exp $ DISTNAME= texinfo-4.6 PKGNAME= g${DISTNAME} @@ -16,7 +16,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews USE_BUILDLINK3= yes USE_PKGLOCALEDIR= yes GNU_CONFIGURE= yes -CONFIG_STATUS_OVERRIDE= ${WRKSRC}/config.status +CONFIG_STATUS_OVERRIDE= config.status INFO_FILES= info-stnd.info info.info texinfo TEST_TARGET= check diff --git a/games/genecys-client/Makefile b/games/genecys-client/Makefile index 65e23377d933..2e986140c011 100644 --- a/games/genecys-client/Makefile +++ b/games/genecys-client/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2004/02/10 22:02:57 garbled Exp $ +# $NetBSD: Makefile,v 1.2 2004/02/12 08:55:34 seb Exp $ # DISTNAME= genecys-0.1 @@ -17,7 +17,7 @@ GNU_CONFIGURE= yes CONFIGURE_DIRS= ${WRKSRC}/common ${WRKSRC}/client BUILD_DIRS= ${WRKSRC}/common ${WRKSRC}/client LIBS+= -lm -CONFIG_STATUS_OVERRIDE= ${WRKSRC}/common/config.status ${WRKSRC}/client/config.status +CONFIG_STATUS_OVERRIDE= common/config.status client/config.status .include "../../graphics/cal3d/buildlink3.mk" .include "../../graphics/OpenRM/buildlink3.mk" diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index bd61877d0120..60fd921e2485 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1386 2004/02/11 10:34:05 xtraeme Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1387 2004/02/12 08:55:34 seb Exp $ # # This file is in the public domain. # @@ -2447,10 +2447,10 @@ _CONFIGURE_POSTREQ+= do-config-status-override do-config-status-override: . for file in ${CONFIG_STATUS_OVERRIDE} ${_PKG_SILENT}${_PKG_DEBUG} \ - if [ -f ${file} ]; then \ - ${RM} -f ${file}; \ - ( ${ECHO} '#!${SH}'; ${ECHO} 'exit 0' ) > ${file}; \ - ${CHMOD} +x ${file}; \ + if [ -f ${WRKSRC}/${file} ]; then \ + ${RM} -f ${WRKSRC}/${file}; \ + ( ${ECHO} '#!${SH}'; ${ECHO} 'exit 0' ) > ${WRKSRC}/${file}; \ + ${CHMOD} +x ${WRKSRC}/${file}; \ fi . endfor .endif