From 095e4e45e3cf697558bb81f6c8db6c64c57fd57e Mon Sep 17 00:00:00 2001 From: Kurt Zenker Date: Thu, 6 Mar 2008 14:14:58 +0000 Subject: [PATCH] INTEGRATION: CWS ause084_DEV300 (1.222.24); FILE MERGED 2008/01/24 17:37:55 hjs 1.222.24.2: RESYNC: (1.222-1.225); FILE MERGED 2007/12/17 17:58:05 hjs 1.222.24.1: #i84663# product.mk and usage gone --- solenv/inc/settings.mk | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk index e00776c92f63..15672978bbe6 100644 --- a/solenv/inc/settings.mk +++ b/solenv/inc/settings.mk @@ -4,9 +4,9 @@ # # $RCSfile: settings.mk,v $ # -# $Revision: 1.227 $ +# $Revision: 1.228 $ # -# last change: $Author: kz $ $Date: 2008-03-05 16:31:49 $ +# last change: $Author: kz $ $Date: 2008-03-06 15:14:58 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -58,16 +58,12 @@ ENABLE_PCH=TRUE .INCLUDE : unitools.mk #have SCRIPTEXT already defined in product.mk but available for all -.IF "$(GUI)"=="WNT" -SCRIPTEXT=.btm +.IF "$(USE_SHELL)"=="4NT" +SCRIPTEXT=.bat .ELSE # "$(GUI)"=="WNT" SCRIPTEXT= .ENDIF # "$(GUI)"=="WNT" -.IF "$(PRODUCTNAME)"!="" -.INCLUDE : product.mk -.ENDIF # "$(PRODUCTNAME)"!="" - .INCLUDE : minor.mk .IF "$(UPDATER)"!="" || "$(CWS_WORK_STAMP)"!=""