summaryrefslogtreecommitdiff
path: root/editors/openoffice.org-2.0-devel/files
diff options
context:
space:
mode:
authorMaho Nakata <maho@FreeBSD.org>2006-04-17 07:24:29 +0000
committerMaho Nakata <maho@FreeBSD.org>2006-04-17 07:24:29 +0000
commitce41446c2776ac9dcab0d1d406ce933ce28f7b92 (patch)
treecabd22e90ccd80fc3609c42e954f3a89a04c2a6a /editors/openoffice.org-2.0-devel/files
parentRemove expired ports: (diff)
Now buildable with GNU GCJ for openoffice.org-2.0.
Preparation of GCJ compilation for openoffice.org-2.0-devel
Notes
Notes: svn path=/head/; revision=159773
Diffstat (limited to 'editors/openoffice.org-2.0-devel/files')
-rw-r--r--editors/openoffice.org-2.0-devel/files/Makefile.knobs14
1 files changed, 6 insertions, 8 deletions
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"