From 078f67fe6d063b110ce56192f8875eb3285de45b Mon Sep 17 00:00:00 2001 From: schmonz Date: Tue, 17 May 2005 08:41:36 +0000 Subject: Ensure that DJB_ERRNO_HACK and any other configure-time actions apply, by setting ${WRKSRC} appropriately during the "configure" phase. This had been the only usage of DJB_CONFIG_DIR. Fixes build on glibc>=2.3.1 systems, otherwise no visible change. --- sysutils/daemontools/Makefile | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'sysutils') diff --git a/sysutils/daemontools/Makefile b/sysutils/daemontools/Makefile index 005f093ca4b..2a100718678 100644 --- a/sysutils/daemontools/Makefile +++ b/sysutils/daemontools/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2005/04/11 21:47:23 tv Exp $ +# $NetBSD: Makefile,v 1.23 2005/05/17 08:41:36 schmonz Exp $ DISTNAME= daemontools-0.76 CATEGORIES= sysutils @@ -16,10 +16,14 @@ DJB_RESTRICTED= YES PKG_INSTALLATION_TYPES= overwrite pkgviews +.if defined(PKG_PHASE) && ${PKG_PHASE} == "configure" +WRKSRC= ${WRKDIR}/admin/${DISTNAME}/src +.else +WRKSRC= ${WRKDIR}/admin/${DISTNAME} +.endif SAMPLERC= svscan.sh.sample SERVICEDIR?= ${VARBASE}/spool/service -WRKSRC= ${WRKDIR}/admin/${DISTNAME} CMDDIR= ${WRKSRC}/command PLIST_SUBST+= SERVICEDIR=${SERVICEDIR} @@ -27,8 +31,6 @@ DEINSTALL_FILE= ${WRKDIR}/.DEINSTALL INSTALLATION_DIRS= bin man man/man8 share/examples/daemontools -DJB_CONFIG_DIR= ${WRKSRC}/src - do-build: cd ${WRKSRC} && package/compile -- cgit v1.2.3