From cae97956a864f3de84dc44d4287cdfcc6b846e5f Mon Sep 17 00:00:00 2001
From: Oliver Bolte <obo@openoffice.org>
Date: Thu, 25 Jan 2007 11:11:56 +0000
Subject: INTEGRATION: CWS ause069 (1.32.8); FILE MERGED 2006/12/04 14:34:35
 hjs 1.32.8.2: RESYNC: (1.32-1.33); FILE MERGED 2006/10/18 17:09:50 hjs
 1.32.8.1: #i70359# remove forced shell calls

---
 berkeleydb/makefile.mk | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'berkeleydb')

diff --git a/berkeleydb/makefile.mk b/berkeleydb/makefile.mk
index 2b87cc06edfe..d2513300ec2e 100644
--- a/berkeleydb/makefile.mk
+++ b/berkeleydb/makefile.mk
@@ -4,9 +4,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.33 $
+#   $Revision: 1.34 $
 #
-#   last change: $Author: vg $ $Date: 2006-11-01 14:08:30 $
+#   last change: $Author: obo $ $Date: 2007-01-25 12:11:56 $
 #
 #   The Contents of this file are made available subject to
 #   the terms of GNU Lesser General Public License Version 2.1.
@@ -71,10 +71,10 @@ LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN'
 .EXPORT: LDFLAGS
 .ENDIF                  # "$(OS)$(COM)"=="LINUXGCC"
 .IF "$(OS)$(COM)"=="SOLARISC52"
-.IF "$(BUILD_TOOLS)$/cc"=="$(shell +-which cc)"
-CC:=$(COMPATH)$/bin$/cc
-CXX:=$(COMPATH)$/bin$/CC
-.ENDIF          # "$(BUILD_TOOLS)$/cc"=="$(shell +-which cc)"
+#.IF "$(BUILD_TOOLS)$/cc"=="$(shell +-which cc)"
+#CC:=$(COMPATH)$/bin$/cc
+#CXX:=$(COMPATH)$/bin$/CC
+#.ENDIF          # "$(BUILD_TOOLS)$/cc"=="$(shell +-which cc)"
 LDFLAGS:=-R\''$$$$ORIGIN'\'
 .EXPORT: LDFLAGS
 .ENDIF                  # "$(OS)$(COM)"=="SOLARISC52"
-- 
cgit