diff options
author | Petr Mladek <pmladek@suse.cz> | 2011-04-05 19:08:20 +0200 |
---|---|---|
committer | Petr Mladek <pmladek@suse.cz> | 2011-04-05 19:08:20 +0200 |
commit | 65a9918180139fb651b2f9e48e546df84fd768ec (patch) | |
tree | b701383b6c3364f900e70dfac367b5e2778cc08c /odk | |
parent | Branch libreoffice-3-4 (diff) | |
parent | Version 3.3.2.1, tag libreoffice-3.3.2.1 (3.3.2-rc1) (diff) | |
download | core-65a9918180139fb651b2f9e48e546df84fd768ec.tar.gz core-65a9918180139fb651b2f9e48e546df84fd768ec.zip |
Merge remote-tracking branch 'origin/libreoffice-3-3' into libreoffice-3-4
Conflicts:
odk/settings/settings.mk
Diffstat (limited to 'odk')
-rw-r--r-- | odk/settings/settings.mk | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk index e4fc05ada699..bbd18eeeef4a 100644 --- a/odk/settings/settings.mk +++ b/odk/settings/settings.mk @@ -502,9 +502,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 @@ -568,6 +570,10 @@ CPPUHELPERLIB=-luno_cppuhelper$(COMID) SALHELPERLIB=-luno_salhelper$(COMID) REGLIB=-lreg STORELIB=-lstore +ifeq "$(STLPORT)" "yes" +endif +else +STLPORTLIB= EMPTYSTRING= PATH_SEPARATOR=: |