diff options
| author | ale <ale@FreeBSD.org> | 2004-11-14 09:17:14 +0000 |
|---|---|---|
| committer | ale <ale@FreeBSD.org> | 2004-11-14 09:17:14 +0000 |
| commit | f71497869b380a2dbff54ef14970a688829f81e2 (patch) | |
| tree | 7f0b4697d46a4690c452996d2e3c515f6d368b25 /java/eclipse | |
| parent | 8f11d131bb3eb82fbe1e44f26fe16595bad2f4bf (diff) | |
| download | FreeBSD-ports-f71497869b380a2dbff54ef14970a688829f81e2.zip FreeBSD-ports-f71497869b380a2dbff54ef14970a688829f81e2.tar.gz | |
Fix compilation using Firefox (adjust headers/libraries locations).
Approved by: nork
Diffstat (limited to 'java/eclipse')
| -rw-r--r-- | java/eclipse/Makefile | 3 | ||||
| -rw-r--r-- | java/eclipse/files/make_gtk.mak | 16 |
2 files changed, 8 insertions, 11 deletions
diff --git a/java/eclipse/Makefile b/java/eclipse/Makefile index 42c9ba2..33a5d9b 100644 --- a/java/eclipse/Makefile +++ b/java/eclipse/Makefile @@ -51,11 +51,9 @@ PLIST_SUB+= MOTIF:="@comment " .if defined(WITH_MOZILLA) && ${WITH_MOZILLA} == "firefox" BUILD_DEPENDS+= firefox:${PORTSDIR}/www/firefox BROWSER= firefox -BROWSER_VER= `ls /usr/X11R6/lib/firefox/include | sed -e "s/firefox-//"` .else BUILD_DEPENDS+= mozilla:${PORTSDIR}/www/mozilla BROWSER= mozilla -BROWSER_VER= .endif .endif @@ -70,7 +68,6 @@ PLIST_SUB+= GNOME:="" .endif MAKE_ARGS= BROWSER=${BROWSER} \ - BROWSER_VER=${BROWSER_VER} \ ECLIPSE_BUILD=${ECLIPSE_BUILD} \ ECLIPSE_ARCH=${ECLIPSE_ARCH} \ ECLIPSE_OS=${ECLIPSE_OS} \ diff --git a/java/eclipse/files/make_gtk.mak b/java/eclipse/files/make_gtk.mak index 222f443..b9d92d6 100644 --- a/java/eclipse/files/make_gtk.mak +++ b/java/eclipse/files/make_gtk.mak @@ -77,17 +77,17 @@ MOZILLACFLAGS = -O \ -I$(JAVA_HOME)/include \ -I$(JAVA_HOME)/include/bsd \ -I$(JAVA_HOME)/include/freebsd \ - -include $(MOZILLA_HOME)/lib/$(BROWSER)/include/$(BROWSER)-$(BROWSER_VER)/mozilla-config.h \ - -I$(MOZILLA_HOME)/lib/$(BROWSER)/include/$(BROWSER)-$(BROWSER_VER) \ - -I$(MOZILLA_HOME)/lib/$(BROWSER)/include/$(BROWSER)-$(BROWSER_VER)/xpcom \ - -I$(MOZILLA_HOME)/lib/$(BROWSER)/include/$(BROWSER)-$(BROWSER_VER)/string \ - -I$(MOZILLA_HOME)/lib/$(BROWSER)/include/$(BROWSER)-$(BROWSER_VER)/nspr \ - -I$(MOZILLA_HOME)/lib/$(BROWSER)/include/$(BROWSER)-$(BROWSER_VER)/embed_base \ - -I$(MOZILLA_HOME)/lib/$(BROWSER)/include/$(BROWSER)-$(BROWSER_VER)/gfx + -include $(MOZILLA_HOME)/include/$(BROWSER)/mozilla-config.h \ + -I$(MOZILLA_HOME)/include/$(BROWSER) \ + -I$(MOZILLA_HOME)/include/$(BROWSER)/xpcom \ + -I$(MOZILLA_HOME)/include/$(BROWSER)/string \ + -I$(MOZILLA_HOME)/include/$(BROWSER)/nspr \ + -I$(MOZILLA_HOME)/include/$(BROWSER)/embed_base \ + -I$(MOZILLA_HOME)/include/$(BROWSER)/gfx endif MOZILLALIBS = -L$(MOZILLA_HOME)/lib/$(BROWSER) \ - -L$(MOZILLA_HOME)/lib/$(BROWSER)/lib/$(BROWSER)-$(BROWSER_VER) \ + -L$(MOZILLA_HOME)/lib/$(BROWSER) \ -lgtkembedmoz -lxpcom MOZILLALDFLAGS = -s |
