diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-09 11:27:50 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-09 11:27:50 +0000 |
| commit | eecfdb1ec578ec9ffddae19bc2d16e6c0cee1c39 (patch) | |
| tree | c1baa12a3507f11b83c9d65e3beff7ab98ec19f3 /solenv | |
| parent | 42e1e9771aeee1bddbac2100ca87c731b02f806e (diff) | |
INTEGRATION: CWS ause057 (1.170.4); FILE MERGED
2006/06/06 14:59:55 hjs 1.170.4.2: RESYNC: (1.170-1.173); FILE MERGED
2006/06/06 14:44:15 hjs 1.170.4.1: #i62048# add lines lost on itegration of ause051
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/inc/target.mk | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/solenv/inc/target.mk b/solenv/inc/target.mk index d2966a3a5214..2e46d4917bf9 100644 --- a/solenv/inc/target.mk +++ b/solenv/inc/target.mk @@ -4,9 +4,9 @@ # # $RCSfile: target.mk,v $ # -# $Revision: 1.173 $ +# $Revision: 1.174 $ # -# last change: $Author: vg $ $Date: 2006-06-02 13:55:03 $ +# last change: $Author: hr $ $Date: 2006-06-09 12:27:50 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -58,6 +58,9 @@ SOLARINC+=$(JDKINCS) SOLARINC+=$(ORCLINC) SOLARINC+=$(DB2INC) SOLARINC+=$(DAOINC) +# make sure INCLUDE isn't set +INCLUDE:= +.EXPORT : INCLUDE .IF "$(PRJINC)"!="" INCLUDE!:=-I. $(ENVINCPRE) $(INCPRE:^"-I":s/-I-I/-I/) -I$(INCLOCAL) $(INCLOCPRJ:^"-I":s/-I-I/-I/) -I$(INC) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) -I$(UNOINCLUDES) -I$(INCEXT) -I$(PRJ)$/res -I$(INCPOST) .ELSE # "$(PRJINC)"!="" |