diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-06-24 10:29:09 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-06-29 11:47:25 +0100 |
| commit | 7b88a07f74525dba783ebc9d25cfdc0f3903d259 (patch) | |
| tree | 860c70ad04ceec6f92ed75a8305a7a7fbd02a038 | |
| parent | 692f7e3a68c443dcb52ab8fadf788f998d0b26ac (diff) | |
bad merge, fix to enable extensions to build again
(cherry picked from commit 194da0076d3b4a6968496261fd2eaca9e8e955f9)
| -rw-r--r-- | odk/settings/settings.mk | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk index bbd18eee..e4fc05ad 100644 --- a/odk/settings/settings.mk +++ b/odk/settings/settings.mk @@ -502,11 +502,9 @@ 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 @@ -570,10 +568,6 @@ CPPUHELPERLIB=-luno_cppuhelper$(COMID) SALHELPERLIB=-luno_salhelper$(COMID) REGLIB=-lreg STORELIB=-lstore -ifeq "$(STLPORT)" "yes" -endif -else -STLPORTLIB= EMPTYSTRING= PATH_SEPARATOR=: |