svn commit: r341335 - in head/Mk: . Uses
Baptiste Daroussin
bapt at FreeBSD.org
Mon Jan 27 08:14:31 UTC 2014
Author: bapt
Date: Mon Jan 27 08:14:30 2014
New Revision: 341335
URL: http://svnweb.freebsd.org/changeset/ports/341335
QAT: https://qat.redports.org/buildarchive/r341335/
Log:
Do not pass DESTDIR to build target (with a syntax compatible with both fmake and bmake)
That fixes a couple of STAGEDIR references in the install files
Modified:
head/Mk/Uses/desthack.mk
head/Mk/bsd.port.mk
Modified: head/Mk/Uses/desthack.mk
==============================================================================
--- head/Mk/Uses/desthack.mk Mon Jan 27 07:32:02 2014 (r341334)
+++ head/Mk/Uses/desthack.mk Mon Jan 27 08:14:30 2014 (r341335)
@@ -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
Modified: head/Mk/bsd.port.mk
==============================================================================
--- head/Mk/bsd.port.mk Mon Jan 27 07:32:02 2014 (r341334)
+++ head/Mk/bsd.port.mk Mon Jan 27 08:14:30 2014 (r341335)
@@ -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 ; \
More information about the svn-ports-head
mailing list