From 214e08275503a4720c380c0d5209822c79024a85 Mon Sep 17 00:00:00 2001
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Wed, 17 Dec 2014 13:01:59 +0000
Subject: Avoid defining do-install if NO_INSTALL is defined

---
 Mk/bsd.port.mk | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

(limited to 'Mk/bsd.port.mk')

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
-- 
cgit v1.2.3