diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2005-12-14 14:37:07 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2005-12-14 14:37:07 +0000 |
| commit | 02645c718a5f7ab55daf885af274197bd39696ef (patch) | |
| tree | aef0857fb37db9624ccd1d96b072fd7a2f84b53e /solenv/inc/settings.mk | |
| parent | a375fff1055e29f5a467ea569447a30f42e56670 (diff) | |
INTEGRATION: CWS ause044 (1.178.4); FILE MERGED
2005/11/28 16:24:53 hjs 1.178.4.1: #i58578#, #i57357# fixes around comp_ver.mk
Diffstat (limited to 'solenv/inc/settings.mk')
| -rw-r--r-- | solenv/inc/settings.mk | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk index 178f0ca4e405..2d6060f94d19 100644 --- a/solenv/inc/settings.mk +++ b/solenv/inc/settings.mk @@ -4,9 +4,9 @@ # # $RCSfile: settings.mk,v $ # -# $Revision: 1.179 $ +# $Revision: 1.180 $ # -# last change: $Author: rt $ $Date: 2005-12-14 15:09:40 $ +# last change: $Author: rt $ $Date: 2005-12-14 15:37:07 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -91,7 +91,7 @@ SOLARVERSION=$(SOLARVER)$/$(UPD) .INCLUDE : minor.mk -.IF "$(UPDATER)"!="" +.IF "$(UPDATER)"!="" || "$(CWS_WORK_STAMP)"!="" %minor.mk : .IF "$(SOURCEVERSION)"=="$(WORK_STAMP)" @+-$(MKDIRHIER) $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT) >& $(NULLDEV) @@ -110,7 +110,7 @@ SOLARVERSION=$(SOLARVER)$/$(UPD) @+$(COPY) $(SOLARENV)$/inc$/minor.mk $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/$(UPD)minor.mk >& $(NULLDEV) @+$(TOUCH) $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/minormkchanged.flg >& $(NULLDEV) .ENDIF # "$(GUI)"=="UNX" -.ENDIF # "$(UPDATER)"!="" +.ENDIF # "$(UPDATER)"!="" || "$(CWS_WORK_STAMP)"!="" .IF "$(BSCLIENT)"=="TRUE" .IF "$(UPDATER)"!="YES" @@ -985,11 +985,6 @@ CDEFS+=-D_STLP_DEBUG CDEFS+=$(CDEFS_PRESET) .ENDIF -.IF "$(COM)"=="GCC" -GXX_INCLUDE_PATH*=$(COMPATH)$/include$/c++$/$(CCVER) -CDEFS+= -DGXX_INCLUDE_PATH=$(GXX_INCLUDE_PATH) -.ENDIF - .IF "$(TIMELOG)" != "" CDEFS+=-DTIMELOG .ENDIF @@ -1156,6 +1151,12 @@ COMID=$(COM) .ENDIF "$(USE_JAVAVER)"!="" .ENDIF # "$(SOLAR_JAVA)"=="TRUE" +.IF "$(COM)"=="GCC" +GXX_INCLUDE_PATH*:=$(COMPATH)$/include$/c++$/$(CCVER) +.EXPORT : GXX_INCLUDE_PATH +CDEFS+= -DGXX_INCLUDE_PATH=$(GXX_INCLUDE_PATH) +.ENDIF + # --- extend new environment ---------------------------------- CDEFS+= -DSUPD=$(UPD) |