diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2003-06-12 08:50:38 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2003-06-12 08:50:38 +0000 |
| commit | 7f214d00c8b5baf2a83c0bee739271dd191f99cb (patch) | |
| tree | cd84ab5a4f9043f6609cb548151b0e464d398f4b /berkeleydb | |
| parent | a76818a8b8209450f130315c312fab47c3de137b (diff) | |
INTEGRATION: CWS mh11rc (1.11.2); FILE MERGED
2003/06/05 14:50:28 mh 1.11.2.1: join: from beta2
Diffstat (limited to 'berkeleydb')
| -rw-r--r-- | berkeleydb/makefile.mk | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/berkeleydb/makefile.mk b/berkeleydb/makefile.mk index 1aae5f6a457e..bf56829709f1 100644 --- a/berkeleydb/makefile.mk +++ b/berkeleydb/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.12 $ +# $Revision: 1.13 $ # -# last change: $Author: vg $ $Date: 2003-06-04 10:41:58 $ +# last change: $Author: vg $ $Date: 2003-06-12 09:50:38 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -83,7 +83,12 @@ CONFIGURE_ACTION=..$/dist$/configure CONFIGURE_FLAGS=--enable-cxx --enable-java --enable-dynamic --enable-shared BUILD_DIR=$(CONFIGURE_DIR) +.IF "$(OS)"=="IRIX" +CONFIGURE_ACTION= $(CONFIG_SHELL) ..$/dist$/configure +BUILD_ACTION=gmake +.ELSE BUILD_ACTION=make +.ENDIF OUT2LIB=$(BUILD_DIR)$/.libs$/libdb*$(DLLPOST) @@ -97,7 +102,14 @@ EXT_USE_STLPORT=TRUE BUILD_DIR=build_win32 .IF "$(COMEX)"=="8" -BUILD_ACTION=wdevenv Berkeley_DB Release +CONFIGURE_DIR=build_win32 +CONFIGURE_ACTION=wdevenv Berkeley_DB Release +.IF "$(USE_SHELL)"!="4nt" +BUILD_ACTION_SEP=; +.ELSE # "$(USE_SHELL)"!="4nt" +BUILD_ACTION_SEP=^ +.ENDIF # "$(USE_SHELL)"!="4nt" +BUILD_ACTION=devenv Berkeley_DB.sln /build Release /project db_buildall /useenv $(BUILD_ACTION_SEP) devenv Berkeley_DB.sln /build Release /project db_java /useenv .ELSE BUILD_ACTION=msdev Berkeley_DB.dsw /useenv /MAKE "db_buildall - RELEASE" /MAKE "db_java - RELEASE" .ENDIF |