From 19e72efdd4db3284be0ae3145388b84b9aed8632 Mon Sep 17 00:00:00 2001
From: "mark%moxienet.com" <mark%moxienet.com>
Date: Fri, 19 Aug 2005 22:50:38 +0000
Subject: [PATCH] Bug 305098, JEP only bundled with Camino and Firefox.  Bundle
 JEP with any Mac product as long as plugins are enabled.  r=josh r=bsmedberg

---
 Makefile.in                | 2 --
 plugin/oji/JEP/Makefile.in | 4 ++++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 4a0d4418cdd3..e369b1616a90 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -338,10 +338,8 @@ endif
 
 # Java Embedding Plugin
 ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
-ifneq (,$(filter macbrowser browser,$(MOZ_BUILD_APP)))
 tier_99_dirs += plugin/oji/JEP
 endif
-endif
 
 ifneq (,$(filter browser suite,$(MOZ_BUILD_APP)))
 tier_99_dirs += xpfe/components/search
diff --git a/plugin/oji/JEP/Makefile.in b/plugin/oji/JEP/Makefile.in
index e8fc8ede9c61..a315c9f84022 100644
--- a/plugin/oji/JEP/Makefile.in
+++ b/plugin/oji/JEP/Makefile.in
@@ -56,14 +56,18 @@ MRJ_PLUGIN_BUNDLE=MRJPlugin.plugin
 ABS_topsrcdir   := $(shell cd $(topsrcdir); pwd)
 ifneq ($(ABS_topsrcdir),$(MOZ_BUILD_ROOT))
 export::
+ifdef MOZ_PLUGINS
 	rsync -a --exclude CVS/ $(srcdir)/$(JEP_PLUGIN_BUNDLE) .
 	rsync -a --exclude CVS/ $(srcdir)/$(MRJ_PLUGIN_BUNDLE) .
 endif
+endif
 
 libs install:: install-plugin
 
 install-plugin: 
+ifdef MOZ_PLUGINS
 	$(INSTALL) $(JEP_PLUGIN_BUNDLE) $(DIST)/bin/plugins
 	$(INSTALL) $(MRJ_PLUGIN_BUNDLE) $(DIST)/bin/plugins
+endif
 
 clean clobber distclean::