From ce41446c2776ac9dcab0d1d406ce933ce28f7b92 Mon Sep 17 00:00:00 2001 From: Maho Nakata Date: Mon, 17 Apr 2006 07:24:29 +0000 Subject: Now buildable with GNU GCJ for openoffice.org-2.0. Preparation of GCJ compilation for openoffice.org-2.0-devel --- editors/openoffice.org-2.0-devel/files/Makefile.knobs | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'editors/openoffice.org-2.0-devel/files') diff --git a/editors/openoffice.org-2.0-devel/files/Makefile.knobs b/editors/openoffice.org-2.0-devel/files/Makefile.knobs index 625bbba1eea9..7cd35078b44b 100644 --- a/editors/openoffice.org-2.0-devel/files/Makefile.knobs +++ b/editors/openoffice.org-2.0-devel/files/Makefile.knobs @@ -6,7 +6,7 @@ CONFIGURE_ARGS+= --with-jdk-home="${JAVA_HOME}" --with-ant-home=${LOCALBASE}/ant .endif .if !defined(WITHOUT_JAVA) && defined(WITH_GNUGCJ) -CONFIGURE_ARGS+= --with-jdk-home="${LOCALBASE}" --with-java=gij --with-ant-home="${WRKDIR}/apache-ant-${ANT_VERSION}" +CONFIGURE_ARGS+= --with-jdk-home="${WRKDIR}/gnugcj" --with-java=gij --with-ant-home="${WRKDIR}/apache-ant-${ANT_VERSION}" .endif .if defined(WITHOUT_JAVA) CONFIGURE_ARGS+= --without-java @@ -98,13 +98,11 @@ pre-fetch: # @${ECHO} "You can compile OOo without Java support with" # @${ECHO} "make -DWITHOUT_JAVA" #.endif -#XXX currently broken -#.if !defined(WITH_GNUGCJ) -# @${ECHO} -# @${ECHO} "You can compile OOo with GNU GCJ instead of SUN's JDK with" -# @${ECHO} "make -DWITH_GNUGCJ" -#.endif -#XXX currently broken +.if !defined(WITH_GNUGCJ) + @${ECHO} + @${ECHO} "You can compile OOo with GNU GCJ instead of SUN's JDK with" + @${ECHO} "make -DWITH_GNUGCJ" +.endif .if !defined(WITH_CUPS) @${ECHO} @${ECHO} "You can compile OOo with CUPS support with" -- cgit v1.2.3