diff options
| author | jmmv <jmmv> | 2005-01-11 20:09:14 +0000 |
|---|---|---|
| committer | jmmv <jmmv> | 2005-01-11 20:09:14 +0000 |
| commit | 861cb085312f6e5f5ec166e35a7427b76e5a05fd (patch) | |
| tree | f2c326f1a6177bcfd70f2aeb8f26ab21dcc96d0e /mk/bsd.pkg.mk | |
| parent | dec5783839cd70e0b9840460a67312ec1e02410f (diff) | |
| download | pkgsrc-861cb085312f6e5f5ec166e35a7427b76e5a05fd.tar.gz | |
Redo previous because it had a chance to cause serious problems, and was
already demonstrated by imake failing.
So, instead of fiddling with PATH's value in multiple places, rely on
PREPEND_PATH to get things right. Hopefully this will DTRT. At least
several local tests have worked without problems.
Diffstat (limited to 'mk/bsd.pkg.mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index cb67df61333..095ee320003 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1555 2005/01/11 13:39:19 jmmv Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1556 2005/01/11 20:09:14 jmmv Exp $ # # This file is in the public domain. # @@ -470,7 +470,7 @@ CONFIGURE_ENV+= COMPILER_RPATH_FLAG="${COMPILER_RPATH_FLAG}" MAKE_FLAGS?= MAKEFILE?= Makefile -MAKE_ENV+= PATH=${LOCALBASE}/bin:${X11BASE}/bin:${PATH} +MAKE_ENV+= PATH=${PATH} MAKE_ENV+= PREFIX=${PREFIX} LOCALBASE=${LOCALBASE} MAKE_ENV+= X11BASE=${X11BASE} CFLAGS="${CFLAGS}" MAKE_ENV+= CPPFLAGS="${CPPFLAGS}" FFLAGS="${FFLAGS}" @@ -1111,7 +1111,7 @@ PKGFILE?= ${PKGREPOSITORY}/${PKGNAME}${PKG_SUFX} CONFIGURE_DIRS?= ${WRKSRC} CONFIGURE_SCRIPT?= ./configure -CONFIGURE_ENV+= PATH=${LOCALBASE}/bin:${X11BASE}/bin:${PATH} +CONFIGURE_ENV+= PATH=${PATH} .if defined(GNU_CONFIGURE) # @@ -1188,7 +1188,7 @@ BUILD_DEFS+= PKG_SYSCONFBASEDIR PKG_SYSCONFDIR # Passed to most of script invocations SCRIPTS_ENV+= CURDIR=${.CURDIR} DISTDIR=${DISTDIR} \ - PATH=${LOCALBASE}/bin:${X11BASE}/bin:${PATH} \ + PATH=${PATH} \ WRKDIR=${WRKDIR} WRKSRC=${WRKSRC} PATCHDIR=${PATCHDIR} \ SCRIPTDIR=${SCRIPTDIR} FILESDIR=${FILESDIR} \ _PKGSRCDIR=${_PKGSRCDIR} PKGSRCDIR=${PKGSRCDIR} DEPENDS="${DEPENDS}" \ |