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 | 27da27c6396b7b6c8599ce72b3d6ed53c0e7b501 (patch) | |
| tree | c8ca2d9740bcbf8a7105c2ed9e145b75a439dc7e | |
| parent | d0ee00c0419c281131dd2c47b908c20cd0dd529a (diff) | |
| parent | f779dacc689b152f5ede60bc8bfc6029c2e77d68 (diff) | |
Merge remote-tracking branch 'origin/libreoffice-3-3' into libreoffice-3-4
Conflicts:
odk/settings/settings.mk
| -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 e4fc05ad..bbd18eee 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=: |