diff options
| author | ahze <ahze@df743ca5-7f9a-e211-a948-0013205c9059> | 2005-11-24 12:01:20 +0800 |
|---|---|---|
| committer | ahze <ahze@df743ca5-7f9a-e211-a948-0013205c9059> | 2005-11-24 12:01:20 +0800 |
| commit | e5a030e047b0d0e9cb8d5fba115c32c895ac7088 (patch) | |
| tree | 3340e59a091ed963fdfd452ae357326921dac39e /Mk | |
| parent | bbd48812a11d376af0c9822c3bbc6bac23460d97 (diff) | |
| download | marcuscom-ports-e5a030e047b0d0e9cb8d5fba115c32c895ac7088.tar marcuscom-ports-e5a030e047b0d0e9cb8d5fba115c32c895ac7088.tar.gz marcuscom-ports-e5a030e047b0d0e9cb8d5fba115c32c895ac7088.tar.bz2 marcuscom-ports-e5a030e047b0d0e9cb8d5fba115c32c895ac7088.tar.lz marcuscom-ports-e5a030e047b0d0e9cb8d5fba115c32c895ac7088.tar.xz marcuscom-ports-e5a030e047b0d0e9cb8d5fba115c32c895ac7088.tar.zst marcuscom-ports-e5a030e047b0d0e9cb8d5fba115c32c895ac7088.zip | |
- Rearrange what is included after bsd.port.pre.mk so things like
.if ${GECKO}=="seamonkey" will work
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@5207 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/bsd.mozilla.mk | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/Mk/bsd.mozilla.mk b/Mk/bsd.mozilla.mk index a12f7706c..4c5a6772f 100644 --- a/Mk/bsd.mozilla.mk +++ b/Mk/bsd.mozilla.mk @@ -2,7 +2,7 @@ # ex:ts=4 # # $FreeBSD$ -# $MCom: ports/Mk/bsd.mozilla.mk,v 1.11 2005/11/23 23:35:50 ahze Exp $ +# $MCom: ports/Mk/bsd.mozilla.mk,v 1.13 2005/11/24 03:09:46 ahze Exp $ # # 4 column tabs prevent hair loss and tooth decay! @@ -53,12 +53,6 @@ ${gecko}_DEPENDS?= ${PORTSDIR}/${${gecko}_PORTSDIR}/${gecko} ${gecko}_PLIST?= ${X11BASE}/lib/${gecko}/libgtkembedmoz.so .endfor -.endif # end Mozilla_Pre_Include - -.if defined(_POSTMKINCLUDED) && !defined(Mozilla_Post_Include) - -Mozilla_Post_Include= bsd.mozilla.mk - # Figure out which mozilla to use # Weed out bad options in USE_GECKO .for badgecko in ${USE_GECKO} @@ -67,6 +61,7 @@ GOOD_USE_GECKO+= ${badgecko} . endif .endfor +.undef GECKO_FALLTHROUGH # Figure out which mozilla to use and weed out the bad ones .if defined(WITH_GECKO) && defined(GOOD_USE_GECKO) . for badgecko in ${WITH_GECKO} @@ -97,6 +92,15 @@ GECKO_FALLTRHOUGH= true . if ${_NEW_GCC_GECKO:M${GECKO}!="" USE_GCC?= 3.4+ . endif +.endif + +.endif # end Mozilla_Pre_Include + +.if defined(_POSTMKINCLUDED) && !defined(Mozilla_Post_Include) + +Mozilla_Post_Include= bsd.mozilla.mk + +.if defined(GECKO) BUILD_DEPENDS+= ${${GECKO}_PLIST}:${${GECKO}_DEPENDS} RUN_DEPENDS+= ${${GECKO}_PLIST}:${${GECKO}_DEPENDS} .else |