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 | |
| parent | 5639308f4b3acffa6116dbc0f8a70aa1efcaa729 (diff) | |
| parent | c7eab7eed6263bdc62f91a2336cc60fdc3d69a49 (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 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=: |