[Midnightbsd-cvs] mports [18999] trunk/Mk/bsd.mport.mk: remove the complex ignore logic and just die.
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Fri May 15 20:24:15 EDT 2015
Revision: 18999
http://svnweb.midnightbsd.org/mports/?rev=18999
Author: laffer1
Date: 2015-05-15 20:24:15 -0400 (Fri, 15 May 2015)
Log Message:
-----------
remove the complex ignore logic and just die. This seems to work with postgres at least
Modified Paths:
--------------
trunk/Mk/bsd.mport.mk
Modified: trunk/Mk/bsd.mport.mk
===================================================================
--- trunk/Mk/bsd.mport.mk 2015-05-16 00:22:36 UTC (rev 18998)
+++ trunk/Mk/bsd.mport.mk 2015-05-16 00:24:15 UTC (rev 18999)
@@ -1774,34 +1774,11 @@
# LAH
.for target in ${_TARGETS}
-.if !target(${target}) && defined(_OPTIONS_OK)
+.if !target(${target}) #&& defined(_OPTIONS_OK)
_PHONY_TARGETS+= ${target}
${target}: ${${target:tu}_COOKIE}
- echo foo
-.elif !target(${target})
-${target}: config-conditional
- @cd ${.CURDIR} && ${MAKE} CONFIG_DONE_${UNIQUENAME:tu}=1 ${${target:tu}_COOKIE}
-.elif target(${target}) && defined(IGNORE)
+ @${IGNORECMD}
.endif
-
-.if !exists(${${target:tu}_COOKIE})
-. if defined(USE_SUBMAKE)
-${${target:tu}_COOKIE}: ${_${target:tu}_DEP}
- @cd ${.CURDIR} && \
- ${MAKE} ${_${target:tu}_REAL_SEQ} ${_${target:tu}_REAL_SUSEQ}
- @${TOUCH} ${TOUCH_FLAGS} ${.TARGET}
-. else # !USE_SUBMAKE
-${${target:tu}_COOKIE}: ${_${target:tu}_DEP} ${_${target:tu}_REAL_SEQ} ${_${target:tu}_REAL_SUSEQ}
- @${TOUCH} ${TOUCH_FLAGS} ${.TARGET}
-. endif # USE_SUBMAKE
-.else # exists(cookie)
-${${target:tu}_COOKIE}::
- @if [ -e ${.TARGET} ]; then \
- ${DO_NADA}; \
- else \
- cd ${.CURDIR} && ${MAKE} ${.TARGET}; \
- fi
-.endif # !exists(cookie)
.endfor # foreach(targets)
.endif
More information about the Midnightbsd-cvs
mailing list