summaryrefslogtreecommitdiff
path: root/hyphen
diff options
context:
space:
mode:
authorRüdiger Timm <rt@openoffice.org>2008-08-27 12:54:37 +0000
committerRüdiger Timm <rt@openoffice.org>2008-08-27 12:54:37 +0000
commit7b83d6549854eeaad0a0fe964f4b359e1e3d2c7a (patch)
tree1260f37daad8e30991f652064fb81cbd444cb15b /hyphen
parent4f618f4477a49f4246a01098eee3d929f2970a38 (diff)
INTEGRATION: CWS sb91 (1.9.4); FILE MERGED
2008/07/11 09:09:01 sb 1.9.4.1: #i91567# adapt to unxsolu4
Diffstat (limited to 'hyphen')
-rw-r--r--hyphen/makefile.mk13
1 files changed, 11 insertions, 2 deletions
diff --git a/hyphen/makefile.mk b/hyphen/makefile.mk
index e5748b71ae5c..ad3436a6eeef 100644
--- a/hyphen/makefile.mk
+++ b/hyphen/makefile.mk
@@ -8,7 +8,7 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.9 $
+# $Revision: 1.10 $
#
# This file is part of OpenOffice.org.
#
@@ -54,12 +54,21 @@ CONFIGURE_DIR=$(BUILD_DIR)
CONFIGURE_ACTION=configure
CONFIGURE_FLAGS= --disable-shared --with-pic
+.IF "$(COM)"=="C52" && "$(CPU)"=="U"
+LCL_CONFIGURE_CFLAGS+=-m64
+.ENDIF
+
.IF "$(SYSBASE)"!=""
.IF "$(EXTRA_CFLAGS)"!=""
-CONFIGURE_FLAGS+= CFLAGS="$(EXTRA_CFLAGS)" CXXFLAGS="$(EXTRA_CFLAGS)"
+LCL_CONFIGURE_CFLAGS+=$(EXTRA_CFLAGS)
+CONFIGURE_FLAGS+=CXXFLAGS="$(EXTRA_CFLAGS)"
.ENDIF # "$(EXTRA_CFLAGS)"!=""
.ENDIF # "$(SYSBASE)"!=""
+.IF "$(LCL_CONFIGURE_CFLAGS)"!=""
+CONFIGURE_FLAGS+=CFLAGS='$(LCL_CONFIGURE_CFLAGS)'
+.ENDIF
+
.IF "$(SYSTEM_HYPH)" == "YES" && "$(WITH_MYSPELL_DICTS)" == "YES"
BUILD_ACTION=make hyph_en_US.dic
.ELIF "$(SYSTEM_HYPH)" == "YES" && "$(WITH_MYSPELL_DICTS)" != "YES"