diff options
| author | Kurt Zenker <kz@openoffice.org> | 2005-07-14 13:59:40 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2005-07-14 13:59:40 +0000 |
| commit | b686b7eb682f7e78bf6b0aec243a1c7863c8905e (patch) | |
| tree | fee6c2361b2b6ded7b4756579aeff4ddf2efe2f7 /berkeleydb | |
| parent | 611d847cdbdd182c3b9f3aa8bd12195e4373899a (diff) | |
INTEGRATION: CWS mh19104 (1.21.4); FILE MERGED
2005/06/17 15:25:51 mh 1.21.4.1: add: ARCHFLAGS, #i48387#
Diffstat (limited to 'berkeleydb')
| -rw-r--r-- | berkeleydb/makefile.mk | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/berkeleydb/makefile.mk b/berkeleydb/makefile.mk index b551135d7667..c01350cdee18 100644 --- a/berkeleydb/makefile.mk +++ b/berkeleydb/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.21 $ +# $Revision: 1.22 $ # -# last change: $Author: hr $ $Date: 2005-04-11 09:32:45 $ +# last change: $Author: kz $ $Date: 2005-07-14 14:59:40 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -95,7 +95,10 @@ PATCH_FILE_NAME=db-4.2.52.patch .IF "$(GUI)"=="UNX" CONFIGURE_DIR=out #relative to CONFIGURE_DIR -CONFIGURE_ACTION=..$/dist$/configure +CONFIGURE_ACTION= \ + setenv CFLAGS "$(ARCH_FLAGS)" && \ + setenv CXXFLAGS "$(ARCH_FLAGS)" && \ + ..$/dist$/configure CONFIGURE_FLAGS=--enable-cxx --enable-dynamic --enable-shared .IF "$(SOLAR_JAVA)"!="" CONFIGURE_FLAGS+=--enable-java |