mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-26 05:02:18 +00:00
Code Issues Releases Activity

Do not pass DESTDIR to build target (with a syntax compatible with both fmake and bmake)

Browse Source 
That fixes a couple of STAGEDIR references in the install files
This commit is contained in:
Baptiste Daroussin 2014-01-27 08:14:30 +00:00
parent e64266f024
commit 7c89ef9773
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=341335
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Mk/Uses/desthack.mk
View File

@ -14,16 +14,9 @@
_INCLUDE_USES_DESTHACK_MK= yes
.if defined(_desthack_ARGS)
IGNORE= USES=desthack does not require args
IGNORE= USES=desthack valide args are none or 'la'
.endif
_USES_POST= desthack
GNU_CONFIGURE_PREFIX= \$${${DESTDIRNAME}}${PREFIX}
GNU_CONFIGURE_MANPREFIX= \$${${DESTDIRNAME}}${MANPREFIX}
.endif
.if defined(_POSTMKINCLUDED) && !defined(_INCLUDE_USES_DESTHACK_POST_MK)
_INCLUDE_USES_DESTHACK_POST_MK= yes
post-stage:
@${SED} -i '' -e 's,${STAGEDIR},,g' ${STAGEDIR}${PREFIX}/lib/*.la
.endif

4
Mk/bsd.port.mk
View File

@ -3625,10 +3625,10 @@ do-configure:
.endif
# Build
# XXX: ${MAKE_ARGS:N${DESTDIRNAME}=*} would be easier but it is not valid with the old fmake
.if !target(do-build)
do-build:
@(cd ${BUILD_WRKSRC}; if ! ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${_MAKE_JOBS} ${MAKE_ARGS} ${ALL_TARGET}; then \
@(cd ${BUILD_WRKSRC}; if ! ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${_MAKE_JOBS} ${MAKE_ARGS:C,${DESTDIRNAME}=.*,,g} ${ALL_TARGET}; then \
if [ -n "${BUILD_FAIL_MESSAGE}" ] ; then \
${ECHO_MSG} "===> Compilation failed unexpectedly."; \
(${ECHO_CMD} "${BUILD_FAIL_MESSAGE}") | ${FMT} 75 79 ; \