[Libreoffice-commits] .: bin/build-ooo bin/ooinstall

Michael Meeks michael at kemper.freedesktop.org
Mon Jan 31 11:59:58 PST 2011


 bin/build-ooo |    2 +-
 bin/ooinstall |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit d057a6dbf76966b5454eff311e31d0378483afbd
Author: Baptiste Daroussin <bapt at freebsd.org>
Date:   Mon Jan 31 19:59:47 2011 +0000

    initial FreeBSD work

diff --git a/bin/build-ooo b/bin/build-ooo
index e4ab354..c3b2248 100755
--- a/bin/build-ooo
+++ b/bin/build-ooo
@@ -11,7 +11,7 @@ fi
 
 export TARFILE_LOCATION
 
-if test "z$BUILD_WIN32" = "z" -a "z`uname -s`" != "zSunOS" -a "z`uname -s`" != "zDarwin" -a "z`uname -s`" != "zOpenBSD"; then
+if test "z$BUILD_WIN32" = "z" -a "z`uname -s`" != "zSunOS" -a "z`uname -s`" != "zDarwin" -a "z`uname -s`" != "zOpenBSD" -a "z`uname -s`" != "zFreeBSD"; then
     if ! test -f /proc/cpuinfo; then
         echo "Looks like proc isn't mounted - this means almost certain"
         echo "Java related weird build failure: please check /proc"
diff --git a/bin/ooinstall b/bin/ooinstall
index 170ee29..2f54005 100755
--- a/bin/ooinstall
+++ b/bin/ooinstall
@@ -31,7 +31,7 @@ sub suck_setup($)
     return 0;
 }
 
-( $^O =~ /openbsd/i ) || ( $^O =~ /darwin/i ) || ( -f "/proc/meminfo" ) || die "The installer cannot work without javaldx running, which requires /proc to be mounted";
+( $^O =~ /freebsd/i) || ( $^O =~ /openbsd/i ) || ( $^O =~ /darwin/i ) || ( -f "/proc/meminfo" ) || die "The installer cannot work without javaldx running, which requires /proc to be mounted";
 
 suck_setup ("./setup") || suck_setup ("bin/setup") || die "can't find bin/setup";
 


More information about the Libreoffice-commits mailing list