[Midnightbsd-cvs] mports [21043] trunk/Mk/bsd.mport.mk: attempt to fix the sub make fetch issue

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Tue Mar 1 16:53:40 EST 2016


Revision: 21043
          http://svnweb.midnightbsd.org/mports/?rev=21043
Author:   laffer1
Date:     2016-03-01 16:53:39 -0500 (Tue, 01 Mar 2016)
Log Message:
-----------
attempt to fix the sub make fetch issue

Modified Paths:
--------------
    trunk/Mk/bsd.mport.mk

Modified: trunk/Mk/bsd.mport.mk
===================================================================
--- trunk/Mk/bsd.mport.mk	2016-03-01 21:17:45 UTC (rev 21042)
+++ trunk/Mk/bsd.mport.mk	2016-03-01 21:53:39 UTC (rev 21043)
@@ -850,6 +850,7 @@
 
 MAKE_FLAGS?=	-f
 MAKEFILE?=		Makefile
+MAKE_CMD?=		${BSDMAKE}
 MAKE_ENV+=		TARGETDIR=${TARGETDIR} \
 			DESTDIR=${DESTDIR} \
 			PREFIX=${PREFIX} \
@@ -3257,10 +3258,10 @@
 			if [ -r "$${subpkgfile}" -a "$$target" = "${DEPENDS_TARGET}" ]; then \
 				if [ -z "${DESTDIR}" ] ; then \
 					${ECHO_MSG} "===>   Installing existing package $${subpkgfile}"; \
-					${PKG_ADD} $${subpkgfile}; \
+					${MPORT_INSTALL} $${subpkgfile}; \
 				else \
 					${ECHO_MSG} "===>   Installing existing package $${subpkgfile} into ${DESTDIR}"; \
-					${PKG_ADD} -C ${DESTDIR} $${subpkgfile}; \
+					${MPORT_INSTALL} $${subpkgfile}; \
 				fi; \
 			else \
 				(cd $$dir; ${MAKE} -DINSTALLS_DEPENDS $$target $$depends_args) ; \
@@ -4118,14 +4119,6 @@
 tags:
 .endif
 
-.if !defined(NOPRECIOUSSOFTMAKEVARS)
-.for softvar in CKSUMFILES _MLINKS
-.if defined(${softvar})
-__softMAKEFLAGS+=      '${softvar}+=${${softvar}:S/'/'\''/g}'
-.endif
-.endfor
-.endif
-
 .if !defined(NOPRECIOUSMAKEVARS)
 # These won't change, so we can pass them through the environment
 .MAKEFLAGS: \



More information about the Midnightbsd-cvs mailing list