diff options
| author | Tor Lillqvist <tlillqvist@novell.com> | 2011-04-18 14:03:23 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@novell.com> | 2011-04-18 14:05:39 +0300 |
| commit | dbcf68f61e36bde0228357f48d40a28beb0e2f52 (patch) | |
| tree | 22181260709ada910bb0e24a2a299673495c9db2 /solenv/inc/target.mk | |
| parent | b3387395a28e1a9eb9be2973ec49c789ed84f7c4 (diff) | |
Kill UPDMINOR and UPDMINOREXT stuff
As far as I know we have no intention to use that stuff. Do we ever
have any idea what it means? But sure, if it turns out that we do want
to, this commit will have to be reverted.
Diffstat (limited to 'solenv/inc/target.mk')
| -rw-r--r-- | solenv/inc/target.mk | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/solenv/inc/target.mk b/solenv/inc/target.mk index 8b5902fede73..3824bdfdebf1 100644 --- a/solenv/inc/target.mk +++ b/solenv/inc/target.mk @@ -1032,7 +1032,7 @@ ALL_JAVA_TARGETS= \ .IF "$(lintit)"=="" .IF "$(L10N_framework)"!="" ALLTAR: \ - "$(SOLARVERSION)/$(INPATH)/inc$(UPDMINOREXT)/$(UPD)minor.mk" \ + "$(SOLARVERSION)/$(INPATH)/inc/$(UPD)minor.mk" \ $(SUBDIRS) \ $(DPRTARGET) \ $(DPZTARGET) \ @@ -1080,7 +1080,7 @@ ALLTAR: \ .ELSE # "$(L10N_framework)"!="" ALLTAR: \ - "$(SOLARVERSION)/$(INPATH)/inc$(UPDMINOREXT)/$(UPD)minor.mk" \ + "$(SOLARVERSION)/$(INPATH)/inc/$(UPD)minor.mk" \ $(MAKEDEMODIR) $(MAKECOMPDIR) $(MAKEXLDIR) \ $(COMPVERMK) \ $(JAVAVERMK) \ @@ -1419,7 +1419,7 @@ $(SCP_PRODUCT_TYPE): .ENDIF # "$(PARFILES)"!="" -"$(SOLARVERSION)/$(INPATH)/inc$(UPDMINOREXT)/minormkchanged.flg" : +"$(SOLARVERSION)/$(INPATH)/inc/minormkchanged.flg" : $(TOUCH) $@ .IF "$(COMPVERMK)"!="" @@ -1428,7 +1428,7 @@ $(SCP_PRODUCT_TYPE): COMPVERMK_PHONY:=.PHONY .ENDIF # "$(COMPATH:s!\!/!)"!="$(COMPATH_STORED)" COMPVTMP:=$(mktmp iii) -"$(COMPVERMK)" $(COMPVERMK_PHONY): $(SOLARVERSION)/$(INPATH)/inc$(UPDMINOREXT)/minormkchanged.flg +"$(COMPVERMK)" $(COMPVERMK_PHONY): $(SOLARVERSION)/$(INPATH)/inc/minormkchanged.flg .IF "$(CCNUMVER)"!="" @echo COMNAME:=$(COMNAME) > $(COMPVTMP) @echo COMID:=$(COMID) >> $(COMPVTMP) @@ -1456,7 +1456,7 @@ COMPVTMP:=$(mktmp iii) .IF "$(JAVALOCATION)"!="$(JAVA_HOME)" "$(JAVAVERMK)" .PHONY : .ELSE # "$(JAVALOCATION)"!="$(JAVA_HOME)" -"$(JAVAVERMK)" : $(SOLARVERSION)/$(INPATH)/inc$(UPDMINOREXT)/minormkchanged.flg +"$(JAVAVERMK)" : $(SOLARVERSION)/$(INPATH)/inc/minormkchanged.flg .ENDIF # "$(JAVALOCATION)"!="$(JAVA_HOME)" @-$(RM) $@ @echo JAVAVER:=$(JAVAVER) > $@ @@ -1960,7 +1960,7 @@ $(MISC)/$(TARGET).dpz $(ZIPDEPPHONY) : $(ZIP1TARGETN) $(ZIP2TARGETN) $(ZIP3TARGE .ENDIF VERSIONTMP:=$(mktmp iii) -$(INCCOM)/%_version.h : $(SOLARVERSION)/$(INPATH)/inc$(UPDMINOREXT)/minormkchanged.flg +$(INCCOM)/%_version.h : $(SOLARVERSION)/$(INPATH)/inc/minormkchanged.flg @echo $(EMQ)#define _BUILD $(EMQ)"$(BUILD)$(EMQ)" > $(VERSIONTMP) @echo $(EMQ)#define _UPD $(EMQ)"$(UPD)$(EMQ)" >> $(VERSIONTMP) @echo $(EMQ)#define _LAST_MINOR $(EMQ)"$(LAST_MINOR)$(EMQ)" >> $(VERSIONTMP) |