[Libreoffice-commits] .: 2 commits - distro-configs/LibreOfficeOpenBSD.conf set_soenv.in
Robert Nagy
rnagy at kemper.freedesktop.org
Mon May 23 00:23:55 PDT 2011
distro-configs/LibreOfficeOpenBSD.conf | 3 ++-
set_soenv.in | 11 ++++++-----
2 files changed, 8 insertions(+), 6 deletions(-)
New commits:
commit f5c0e663ee2c0f7595d86632a54e7cfb6302508b
Author: Robert Nagy <robert at openbsd.org>
Date: Mon May 23 09:24:04 2011 +0200
use $GNUMAKE to print the build instructions
diff --git a/set_soenv.in b/set_soenv.in
index de9ca67..a01a8d0 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -84,7 +84,7 @@ my ( $oldPATH, $SRC_ROOT, $SO_HOME, $JAVA_HOME, $JDK, $JAVAFLAGS, $OOO_SHELL,
$USE_DIRECTX5, $ATL_LIB, $ATL_INCLUDE, $MFC_LIB, $MFC_INCLUDE, $TMPDIR,
$COMMON_BUILD_TOOLS, $WIN_GREP, $WIN_FIND, $WIN_LS,
$WIN_GNUCOPY, $WIN_TOUCH, $MOZILLA_VERSION, $MOZILLA_TOOLKIT, $PREBUILD_MOZAB, $MOZILLABUILD,
- $PROEXT, $TARFILE_LOCATION,
+ $PROEXT, $TARFILE_LOCATION, $GNUMAKE,
$PYTHON, $SYSTEM_PYTHON, $SYSTEM_MOZILLA, $EPM_FLAGS);
#
#-------------------------------------------
@@ -136,6 +136,7 @@ $GLIBC = ""; # Whether the platform uses glibc
$PROEXT = "@PROEXT@";
$EPM_FLAGS = "";
$CL_X64 = '@CL_X64@';
+$GNUMAKE = "@GNUMAKE@";
#
#--------------------------------------------------------------------
@@ -2137,10 +2138,10 @@ if ( $Warning ne "" )
print "*********************************************************".
"******************* $newline";
-print "To build, issue:\nmake\n\n";
-print "To install when the build is finished, issue:\nmake install\n\n";
-print "If you want to develop LibreOffice, you might prefer:\nmake dev-install\n\n";
-print "If you want to run the smoketest, issue:\nmake check\n\n";
+print "To build, issue:\n$GNUMAKE\n\n";
+print "To install when the build is finished, issue:\n$GNUMAKE install\n\n";
+print "If you want to develop LibreOffice, you might prefer:\n$GNUMAKE dev-install\n\n";
+print "If you want to run the smoketest, issue:\n$GNUMAKE check\n\n";
$bootfile = "bootstrap";
open( OUT, ">$bootfile" ) ||
commit 1695a2a7cc4fb7d3056734fa3ee62910645cda75
Author: Robert Nagy <robert at openbsd.org>
Date: Mon May 23 09:23:54 2011 +0200
fix ant home
diff --git a/distro-configs/LibreOfficeOpenBSD.conf b/distro-configs/LibreOfficeOpenBSD.conf
index 19fc9d8..40c15e0 100644
--- a/distro-configs/LibreOfficeOpenBSD.conf
+++ b/distro-configs/LibreOfficeOpenBSD.conf
@@ -21,9 +21,10 @@
--enable-ext-report-builder
--enable-ext-wiki-publisher
--with-alloc=system
---with-ant-home=/usr/local/ant/lib
+--with-ant-home=/usr/local/ant
--with-extension-integration
--with-fonts
+--with-java
--with-java-target-version=1.5
--with-jdk-home=/usr/local/jdk-1.5.0
--with-myspell-dicts
More information about the Libreoffice-commits
mailing list