[Midnightbsd-cvs] mports [16020] trunk/Mk/components/licenses.mk: fix license list target
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sun Mar 2 18:51:56 EST 2014
Revision: 16020
http://svnweb.midnightbsd.org/mports/?rev=16020
Author: laffer1
Date: 2014-03-02 18:51:55 -0500 (Sun, 02 Mar 2014)
Log Message:
-----------
fix license list target
Modified Paths:
--------------
trunk/Mk/components/licenses.mk
Modified: trunk/Mk/components/licenses.mk
===================================================================
--- trunk/Mk/components/licenses.mk 2014-03-02 23:51:22 UTC (rev 16019)
+++ trunk/Mk/components/licenses.mk 2014-03-02 23:51:55 UTC (rev 16020)
@@ -10,12 +10,12 @@
@${ECHO_MSG} ${_LICENSES}
.endif
-.if defined(LICENSE)
-
# Include known licenses from database
-
+# Must be done so that license-list target works
.include "${PORTSDIR}/Mk/components/licenses.db.mk"
+.if defined(LICENSE)
+
# Lists of variables and valid components
#
# _LICENSE_LIST_PERMS - Valid permission components
@@ -468,6 +468,7 @@
# Display, ask and save preference if requested
+.if !target(ask-license)
ask-license: ${_LICENSE_COOKIE}
${_LICENSE_COOKIE}:
@@ -488,6 +489,9 @@
. endfor
.endif
+.endif
+# end !target ask-license
+
.if ${_LICENSE_STATUS} == "ask"
. if !defined(NO_LICENSES_DIALOGS)
# Dialog interface
More information about the Midnightbsd-cvs
mailing list