INTEGRATION: CWS sb37 (1.173.12); FILE MERGED

2005/09/12 18:05:59 hjs 1.173.12.2: RESYNC: (1.173-1.176); FILE MERGED
2005/09/12 15:43:48 hjs 1.173.12.1: #125477# set workstamp define to a value
This commit is contained in:
Jens-Heiner Rechtien 2005-12-28 15:55:40 +00:00
parent b97c3b72ca
commit c24d3652a3

View file

@ -4,9 +4,9 @@
# #
# $RCSfile: settings.mk,v $ # $RCSfile: settings.mk,v $
# #
# $Revision: 1.180 $ # $Revision: 1.181 $
# #
# last change: $Author: rt $ $Date: 2005-12-14 15:37:07 $ # last change: $Author: hr $ $Date: 2005-12-28 16:55:40 $
# #
# The Contents of this file are made available subject to # The Contents of this file are made available subject to
# the terms of GNU Lesser General Public License Version 2.1. # the terms of GNU Lesser General Public License Version 2.1.
@ -1316,7 +1316,7 @@ environment_confusion:
.ENDIF # "$(DISABLE_JAVA)"=="" .ENDIF # "$(DISABLE_JAVA)"==""
.IF "$(WORK_STAMP)"!="" .IF "$(WORK_STAMP)"!=""
CDEFS+=-D$(WORK_STAMP) CDEFS+=-D$(WORK_STAMP)=$(WORK_STAMP)
.ENDIF .ENDIF
.INCLUDE .IGNORE: $(UPD)$(LAST_MINOR).mk .INCLUDE .IGNORE: $(UPD)$(LAST_MINOR).mk