[Libreoffice-commits] .: Branch 'libreoffice-3-3' - odk/settings

[René Engelhard]

 odk/settings/settings.mk |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 8cf803c664182e2aac245695fb3ddf36aac9b877
Author: Rene Engelhard <rene at debian.org>
Date:   Fri Feb 11 22:42:48 2011 +0100

    fix ODK settings.mk to only set STLPORTLIB if needed
    
    Signed-off-by: Petr Mladek <pmladek at suse.cz>

diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk
index 188ff88..3d67ee5 100644
--- a/odk/settings/settings.mk
+++ b/odk/settings/settings.mk
@@ -262,14 +262,12 @@ ifeq "$(PROCTYPE)" "powerpc"
 PACKAGE_LIB_DIR=linux_powerpc.plt
 UNOPKG_PLATFORM=Linux_PowerPC
 JAVA_PROC_TYPE=ppc
-STLPORT=yes
 endif
 
 ifeq "$(PROCTYPE)" "sparc"
 PACKAGE_LIB_DIR=linux_sparc.plt
 UNOPKG_PLATFORM=Linux_SPARC
 JAVA_PROC_TYPE=sparc
-STLPORT=yes
 endif
 
 ifeq "$(PROCTYPE)" "x86_64"
@@ -503,9 +501,11 @@ PLATFORM=kfreebsd
 ifeq "$(PROCTYPE)" "x86_64"
 PACKAGE_LIB_DIR=kfreebsd_x86_64.plt
 UNOPKG_PLATFORM=kFreeBSD_x86_64
+STLPORT=no
 else
 PACKAGE_LIB_DIR=kfreebsd_x86.plt
 UNOPKG_PLATFORM=kFreeBSD_x86
+STLPORT=no
 endif
 else
 PLATFORM=freebsd
@@ -569,11 +569,15 @@ CPPUHELPERLIB=-luno_cppuhelper$(COMID)
 SALHELPERLIB=-luno_salhelper$(COMID)
 REGLIB=-lreg
 STORELIB=-lstore
+ifeq "$(STLPORT)" "yes"
 ifeq "$(STLPORT_VER)" "500"
 STLPORTLIB=-lstlport
 else
 STLPORTLIB=-lstlport_gcc$(STLDEBUG)
 endif
+else
+STLPORTLIB=
+endif
 
 EMPTYSTRING=
 PATH_SEPARATOR=: