diff options
| author | Mathieu Arnold <mat@FreeBSD.org> | 2015-11-05 12:35:26 +0000 |
|---|---|---|
| committer | Mathieu Arnold <mat@FreeBSD.org> | 2015-11-05 12:35:26 +0000 |
| commit | ec218a1332be3111b2cca8d13d52f6f7ad0691e0 (patch) | |
| tree | 1ee3a703612ee2e6a2d97f2814c94a07701d832c /Mk/Uses/pathfix.mk | |
| parent | net/belle-sip: Update version 1.4.1=>1.4.2 (diff) | |
Change the meaning of NO_WRKSUBDIR to force a WRKDIR != WRKSRC.
Right now, NO_WRKSUBDIR means that the extraction does not produce a
subdirectory, and that everything goes straight into WRKDIR. It is
problematic, because during the build of a port, quite a few files are
created in there, and then, a stage directory, where everything is
installed, and then a pkg directory where the package is created, and
those often conflict, or get in the way, of the building process.
With this, NO_WRKSUBDIR will extract the distfiles directly into WRKSRC
instead of WRKDIR. In this case, WRKSRC is artificial and is based on
PKGNAME and not DISTNAME, mitigate conflicts with rc files.
PR: 204056
Submitted by: mat
Reviewed by: bapt
Exp-run: antoine
Sponsored by: Absolight
Differential Revision: https://reviews.freebsd.org/D2735
Notes
Notes:
svn path=/head/; revision=400846
Diffstat (limited to 'Mk/Uses/pathfix.mk')
| -rw-r--r-- | Mk/Uses/pathfix.mk | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Mk/Uses/pathfix.mk b/Mk/Uses/pathfix.mk index 6db22811ffca..f191f9ea4026 100644 --- a/Mk/Uses/pathfix.mk +++ b/Mk/Uses/pathfix.mk @@ -17,10 +17,11 @@ IGNORE= USES=pathfix does not require args .endif PATHFIX_MAKEFILEIN?= Makefile.in +PATHFIX_WRKSRC?= ${WRKSRC} _USES_patch+= 190:pathfix pathfix: - @${FIND} ${WRKSRC} -name "${PATHFIX_MAKEFILEIN}" -type f | ${XARGS} ${REINPLACE_CMD} -e \ + @${FIND} ${PATHFIX_WRKSRC} -name "${PATHFIX_MAKEFILEIN}" -type f | ${XARGS} ${REINPLACE_CMD} -e \ 's|[(]libdir[)]/locale|(prefix)/share/locale|g ; \ s|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g ; \ s|[(]LIBDIR[)]/pkgconfig|(PREFIX)/libdata/pkgconfig|g ; \ |