diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2009-04-23 15:52:08 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2009-04-23 15:52:08 +0000 |
| commit | 8034f570cbe5227a12a4cca420844f76d10dc623 (patch) | |
| tree | 5197805798cf466db87ea43a50084f6a61f5da38 /solenv/inc/target.mk | |
| parent | bc54cd7501259e237bbcf1edab5412cf6160b348 (diff) | |
CWS-TOOLING: integrate CWS ause100
2009-04-07 18:39:24 +0200 hjs r270608 : #i100932# add chmod to ease later removal
2009-04-03 19:18:44 +0200 hjs r270516 : #i100675# convert for now...
2009-04-03 17:40:55 +0200 hjs r270510 : #i100837# force use of GNU tar
2009-04-03 17:32:11 +0200 hjs r270508 : #i100837# clean tarballs and a readme
2009-04-03 17:29:35 +0200 hjs r270507 : #i100837# introduce $(TAR) and $(GNUTAR)
2009-04-03 12:22:47 +0200 hjs r270469 : #i100793# check for GNU tar
2009-03-30 17:30:20 +0200 hjs r270247 : #i100675# common comp_ver.mk for both windows shells
2009-03-30 13:49:55 +0200 hjs r270226 : #i100675# common comp_ver.mk for both windows shells
2009-03-30 13:36:00 +0200 hjs r270223 : #i100675# no backslash in dependencies
2009-03-30 13:34:14 +0200 hjs r270222 : #i100675# fix testhxx for cygwin
2009-03-27 16:34:33 +0100 hjs r270162 : #i98068# move that block where it makes sense
2009-03-27 16:16:41 +0100 hjs r270160 : #i92036# - two step move to have a simple rename in the shared dir
Diffstat (limited to 'solenv/inc/target.mk')
| -rw-r--r-- | solenv/inc/target.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/solenv/inc/target.mk b/solenv/inc/target.mk index 4a2240df53ac..a8fbfbf9f5aa 100644 --- a/solenv/inc/target.mk +++ b/solenv/inc/target.mk @@ -1442,9 +1442,9 @@ $(SCP_PRODUCT_TYPE): .IF "$(COMPVERMK)"!="" .IF "$(UPDATER)"!="" || "$(CWS_WORK_STAMP)"!="" -.IF "$(COMPATH)"!="$(COMPATH_STORED)" +.IF "$(COMPATH:s!\!/!)"!="$(COMPATH_STORED)" COMPVERMK_PHONY:=.PHONY -.ENDIF # "$(COMPATH)"!="$(COMPATH_STORED)" +.ENDIF # "$(COMPATH:s!\!/!)"!="$(COMPATH_STORED)" COMPVTMP:=$(mktmp iii) "$(COMPVERMK)" $(COMPVERMK_PHONY): $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/minormkchanged.flg .IF "$(CCNUMVER)"!="" @@ -1456,9 +1456,9 @@ COMPVTMP:=$(mktmp iii) @echo CCNUMVER:=$(CCNUMVER) >> $(COMPVTMP) @echo CCVER:=$(CCVER:s/-/ /:1) >> $(COMPVTMP) @echo CDEFS+=-DCPPU_ENV=$(COMNAME) >> $(COMPVTMP) - @echo COMPATH_STORED:=$(COMPATH) >> $(COMPVTMP) + @echo COMPATH_STORED:=$(COMPATH:s!\!/!) >> $(COMPVTMP) @@-$(RM) $(@)_$(COMPVTMP:b) - @$(TYPE) $(COMPVTMP) > $(@)_$(COMPVTMP:b) + @$(TYPE) $(COMPVTMP) | tr -d "\015" > $(@)_$(COMPVTMP:b) @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ >& $(NULLDEV) $(FI) @-$(RENAME) $(@)_$(COMPVTMP:b) $@ @@-$(RM) $(@)_$(COMPVTMP:b) |