1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-20 20:09:11 +00:00

Fix compilation using Firefox (adjust headers/libraries locations).

Approved by:	nork
This commit is contained in:
Alex Dupre 2004-11-14 09:17:14 +00:00
parent dce3c88387
commit 4667b2bc85
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=121550
2 changed files with 8 additions and 11 deletions

View File

@ -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} \

View File

@ -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