svn commit: r374845 - head/Mk

[Baptiste Daroussin]

Author: bapt
Date: Wed Dec 17 13:01:59 2014
New Revision: 374845
URL: https://svnweb.freebsd.org/changeset/ports/374845
QAT: https://qat.redports.org/buildarchive/r374845/

Log:
  Avoid defining do-install if NO_INSTALL is defined

Modified:
  head/Mk/bsd.port.mk

Modified: head/Mk/bsd.port.mk
==============================================================================
--- head/Mk/bsd.port.mk	Wed Dec 17 12:59:30 2014	(r374844)
+++ head/Mk/bsd.port.mk	Wed Dec 17 13:01:59 2014	(r374845)
@@ -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