From 2c7ad74c1d1348ff691160ce4811cbc905d4cc04 Mon Sep 17 00:00:00 2001
From: "smfr%smfr.org" <smfr%smfr.org>
Date: Sat, 30 Jul 2005 01:11:59 +0000
Subject: [PATCH] Fix JEP and MRJ plugin building in objdir builds (bug
 301076). Camino only, npodb.

---
 plugin/oji/JEP/Makefile.in | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/plugin/oji/JEP/Makefile.in b/plugin/oji/JEP/Makefile.in
index 4dea83bcdb32..0c6c033a2a26 100644
--- a/plugin/oji/JEP/Makefile.in
+++ b/plugin/oji/JEP/Makefile.in
@@ -49,10 +49,21 @@ TARGET		= "JEP Plugin"
 
 unexport CC CXX
 
+JEP_PLUGIN_BUNDLE=JavaEmbeddingPlugin.bundle
+MRJ_PLUGIN_BUNDLE=MRJPlugin.plugin
+
+# for objdir builds, copy the project, and symlink the sources
+ABS_topsrcdir   := $(shell cd $(topsrcdir); pwd)
+ifneq ($(ABS_topsrcdir),$(MOZ_BUILD_ROOT))
+export::
+	ln -fs $(srcdir)/$(JEP_PLUGIN_BUNDLE) .
+	ln -fs $(srcdir)/$(MRJ_PLUGIN_BUNDLE) .
+endif
+
 libs install:: install-plugin
 
 install-plugin: 
-	$(INSTALL) "JavaEmbeddingPlugin.bundle" $(DIST)/bin/plugins
-	$(INSTALL) "MRJPlugin.plugin" $(DIST)/bin/plugins
+	$(INSTALL) $(JEP_PLUGIN_BUNDLE) $(DIST)/bin/plugins
+	$(INSTALL) $(MRJ_PLUGIN_BUNDLE) $(DIST)/bin/plugins
 
 clean clobber distclean::