diff options
| author | Tor Lillqvist <tlillqvist@novell.com> | 2011-07-01 15:37:03 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@novell.com> | 2011-07-01 15:37:03 +0300 |
| commit | ce31567afbc01fe700913019061419207d1bbebb (patch) | |
| tree | 0eb22e63127a19d3e91135f25a5d689345ff5417 /solenv/inc/settings.mk | |
| parent | f975a503fcf4acc5e9600f58bf0ed55c3a49b802 (diff) | |
Goodbye to CWS_WORK_STAMP
Diffstat (limited to 'solenv/inc/settings.mk')
| -rw-r--r-- | solenv/inc/settings.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk index 61e7ba050173..352b8503b5ec 100644 --- a/solenv/inc/settings.mk +++ b/solenv/inc/settings.mk @@ -57,7 +57,7 @@ NETWORK_BUILD:=TRUE PLATFORMID = $(RTL_OS:l)_$(RTL_ARCH:l) EXTNAME*=$(EXTENSIONNAME)_in -.IF "$(UPDATER)"!="" || "$(CWS_WORK_STAMP)"!="" +.IF "$(UPDATER)"!="" .IF "$(SOURCEVERSION)"!="$(WORK_STAMP)" .ERROR : ; @echo Forced error: minor.mk in solenv/inc does not match your version! @@ -69,7 +69,7 @@ WRONG_SOURCEVERSION @@-$(MKDIRHIER) $(SOLARVERSION)/$(INPATH)/inc @@$(COPY) $(SOLARENV)/inc/minor.mk $(SOLARVERSION)/$(INPATH)/inc/$(UPD)minor.mk @@$(TOUCH) $(SOLARVERSION)/$(INPATH)/inc/minormkchanged.flg -.ENDIF # "$(UPDATER)"!="" || "$(CWS_WORK_STAMP)"!="" +.ENDIF # "$(UPDATER)"!="" # Force creation of $(SOLARVERSION)/$(INPATH)/inc/ # $(UPD)minor.mk could be empty as it's contents were already included from minor.mk |