Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 26 Jul 2004 14:20:45 -0400
From:      Jeremy Faulkner <gldisater@gldis.ca>
To:        freebsd-java@freebsd.org
Cc:        nork@freebsd.org
Subject:   Re: HEADS UP: Eclipse 3.0 updated
Message-ID:  <41054B7D.6050206@gldis.ca>
In-Reply-To: <20040726.130935.74732878.sugitk@rio.odn.ne.jp>
References:  <20040725171544.71dc613e.nork@FreeBSD.org> <20040726.130935.74732878.sugitk@rio.odn.ne.jp>

next in thread | previous in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format.
--------------090509080500090604010900
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Transfer-Encoding: 7bit

SUGIMURA Takashi wrote:
> I made Eclipse 3.0 from the newest ports, and I found a problem.
> 
> At /usr/local/eclipse/eclipse,
> DEFAULT_JAVA_HOME and ECLIPSE_HOME are not set.
> 
> ---
> SUGIMURA Takashi <sugitk@rio.odn.ne.jp>

Patch attached.

-- 
Jeremy Faulkner				http://www.gldis.ca

--------------090509080500090604010900
Content-Type: text/plain;
 name="eclipse-files-Makefile.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="eclipse-files-Makefile.diff"

--- eclipse/files/Makefile	Sun Jul 25 07:30:36 2004
+++ eclipse.mod/files/Makefile	Mon Jul 26 14:09:47 2004
@@ -59,7 +59,7 @@
 		$(ANT) -Djava.home=$(JAVA_HOME)
 	@$(ECHO) "===> Building libcore."
 	cd plugins/org.eclipse.core.resources.freebsd/src && \
-		env JDK_INCLUDE="/usr/local/jdk1.4.2/include -I/usr/local/jdk1.4.2/include/freebsd" $(GMAKE) && \
+		env JDK_INCLUDE="$(JAVA_HOME)/include -I$(JAVA_HOME)/include/freebsd" $(GMAKE) && \
 		$(CP) *.so ../../org.eclipse.core.resources.freebsd/os/freebsd/x86
 
 java:		build-install
@@ -74,8 +74,8 @@
 	$(UNZIP_CMD) result/$(ECLIPSE_OS)-$(ECLIPSE_WS)-$(ECLIPSE_ARCH)-sdk.zip -d $(PREFIX)
 	@$(ECHO) "===> Installing a shell script..."
 	@$(SED) \
-	-e "/%%ECLIPSE_HOME%%/s//$(PORTDESTDIR:S/\//\\\//g)/g" \
-	-e "/%%JAVA_HOME%%/s//$(JAVA_HOME:S/\//\\\//g)/g" \
+	-e "s+%%ECLIPSE_HOME%%+$(PORTDESTDIR)+g" \
+	-e "s+%%JAVA_HOME%%+$(JAVA_HOME)+g" \
 	eclipse.in > eclipse.tmp
 	$(BSD_INSTALL_SCRIPT) eclipse.tmp $(PREFIX)/bin/eclipse
 

--------------090509080500090604010900--



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?41054B7D.6050206>