Date: Sun, 5 Dec 2010 09:06:06 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r459 - branches/experimental/Mk Message-ID: <201012050906.oB5966ej017353@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: beat
Date: Sun Dec 5 09:06:06 2010
New Revision: 459
Log:
- Set RUN_DEPENDS if USE_${GECKO}_BUILD is used
Modified:
branches/experimental/Mk/bsd.gecko.mk
Modified: branches/experimental/Mk/bsd.gecko.mk
==============================================================================
--- branches/experimental/Mk/bsd.gecko.mk Sun Dec 5 08:34:52 2010 (r458)
+++ branches/experimental/Mk/bsd.gecko.mk Sun Dec 5 09:06:06 2010 (r459)
@@ -242,12 +242,10 @@
.if defined(USE_FIREFOX) || defined(USE_FIREFOX_BUILD)
# Process USE_FIREFOX_BUILD
-.if !defined(USE_FIREFOX)
.if defined(USE_FIREFOX_BUILD)
USE_FIREFOX:= ${USE_FIREFOX_BUILD}
_FIREFOX_BUILD_DEPENDS= yes
.endif
-.endif
_FIREFOX_DEFAULT_VERSION= 36
_FIREFOX_VERSIONS= 36 35
@@ -331,9 +329,8 @@
.if defined(USE_FIREFOX)
.if defined(_FIREFOX_BUILD_DEPENDS)
BUILD_DEPENDS+= ${${USE_FIREFOX}_DEPENDS}
-.else
-RUN_DEPENDS+= ${${USE_FIREFOX}_DEPENDS}
.endif
+RUN_DEPENDS+= ${${USE_FIREFOX}_DEPENDS}
.endif
.endif # defined(USE_FIREFOX)
@@ -343,12 +340,10 @@
.if defined(USE_SEAMONKEY) || defined(USE_SEAMONKEY_BUILD)
# Process USE_SEAMONKEY_BUILD
-.if !defined(USE_SEAMONKEY)
.if defined(USE_SEAMONKEY_BUILD)
USE_SEAMONKEY:= ${USE_SEAMONKEY_BUILD}
_SEAMONKEY_BUILD_DEPENDS= yes
.endif
-.endif
_SEAMONKEY_DEFAULT_VERSION= 20
_SEAMONKEY_VERSIONS= 11 20
@@ -430,9 +425,8 @@
.if defined(USE_SEAMONKEY)
.if defined(_SEAMONKEY_BUILD_DEPENDS)
BUILD_DEPENDS+= ${${USE_SEAMONKEY}_DEPENDS}
-.else
-RUN_DEPENDS+= ${${USE_SEAMONKEY}_DEPENDS}
.endif
+RUN_DEPENDS+= ${${USE_SEAMONKEY}_DEPENDS}
.endif
.endif # defined(USE_SEAMONKEY)
@@ -442,12 +436,10 @@
.if defined(USE_THUNDERBIRD) || defined(USE_THUNDERBIRD_BUILD)
# Process USE_THUNDERBIRD_BUILD
-.if !defined(USE_THUNDERBIRD)
.if defined(USE_THUNDERBIRD_BUILD)
USE_THUNDERBIRD:= ${USE_THUNDERBIRD_BUILD}
_THUNDERBIRD_BUILD_DEPENDS= yes
.endif
-.endif
_THUNDERBIRD_DEFAULT_VERSION= 31
_THUNDERBIRD_VERSIONS= 31 30
@@ -529,9 +521,8 @@
.if defined(USE_THUNDERBIRD)
.if defined(_THUNDERBIRD_BUILD_DEPENDS)
BUILD_DEPENDS+= ${${USE_THUNDERBIRD}_DEPENDS}
-.else
-RUN_DEPENDS+= ${${USE_THUNDERBIRD}_DEPENDS}
.endif
+RUN_DEPENDS+= ${${USE_THUNDERBIRD}_DEPENDS}
.endif
.endif # defined(USE_THUNDERBIRD)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201012050906.oB5966ej017353>