aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbapt <bapt@FreeBSD.org>2014-12-17 21:01:59 +0800
committerbapt <bapt@FreeBSD.org>2014-12-17 21:01:59 +0800
commitfb7974a192355cd862583d18c0cdf712bdb7bc23 (patch)
tree0e6fb9f527959d3f61a3720b9b9907f78e3cee14
parent7b3db40a9d55bbaaf3940754b31e2d090b946746 (diff)
downloadfreebsd-ports-gnome-fb7974a192355cd862583d18c0cdf712bdb7bc23.tar.gz
freebsd-ports-gnome-fb7974a192355cd862583d18c0cdf712bdb7bc23.tar.zst
freebsd-ports-gnome-fb7974a192355cd862583d18c0cdf712bdb7bc23.zip
Avoid defining do-install if NO_INSTALL is defined
-rw-r--r--Mk/bsd.port.mk8
1 files changed, 1 insertions, 7 deletions
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index cc39e9d47adb..5d5613ce5e23 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -3033,12 +3033,6 @@ build: configure
@${TOUCH} ${TOUCH_FLAGS} ${BUILD_COOKIE}
.endif
-# Disable install
-.if defined(NO_INSTALL) && !target(do-install)
-do-install:
- @${DO_NADA}
-.endif
-
# Disable package
.if defined(NO_PACKAGE) && !target(package)
package:
@@ -3561,7 +3555,7 @@ check-install-conflicts:
# Install
-.if !target(do-install)
+.if !target(do-install) && !defined(NO_INSTALL)
do-install:
@(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET})
.endif