From 6fbc8496ce8df2b726634ee7e98d161222b6fb0d Mon Sep 17 00:00:00 2001 From: Jung-uk Kim Date: Mon, 28 Mar 2011 21:08:52 +0000 Subject: Force libxul include directory and allow building IcedTea-Web plugin with an ancient xulrunner (i.e., 1.9.2.9 and earlier). This commit should fix: PR: ports/155381 --- java/openjdk6/files/Makefile.plugin | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'java') diff --git a/java/openjdk6/files/Makefile.plugin b/java/openjdk6/files/Makefile.plugin index 900845191796..d9b6ce7e17ea 100644 --- a/java/openjdk6/files/Makefile.plugin +++ b/java/openjdk6/files/Makefile.plugin @@ -48,8 +48,12 @@ CFLAGS+= -DJDK_UPDATE_VERSION="\"${JDK_UPDATE_VERSION}\"" \ -DPLUGIN_NAME="\"${PLUGIN_NAME}\"" \ -DPLUGIN_VERSION="\"${PLUGIN_VERSION}\"" \ -DPACKAGE_URL="\"${PACKAGE_URL}\"" \ - -DMOZILLA_VERSION_COLLAPSED="${MOZILLA_VERSION2}" \ - ${PLUGIN_CFLAGS} + -DMOZILLA_VERSION_COLLAPSED="${MOZILLA_VERSION2}" +.if ${MOZILLA_VERSION2} >= 1090200 +CFLAGS+= ${PLUGIN_CFLAGS:S,/libxul/stable,/libxul,} +.else +CFLAGS+= ${PLUGIN_CFLAGS:S,/libxul/stable,/libxul/unstable,} +.endif LDFLAGS+= ${PLUGIN_LIBS} .include -- cgit v1.2.3