Skip to content

C
core
Kaydet (Commit) 4b154172 authored tarafından Lionel Elie Mamane's avatar Lionel Elie Mamane
Dosyalara gözat
Seçenekler

Revert "tg_ext: fix unpack for zip files" 

This reverts commit fb46e93e.
üst 0fe6184d
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
solenv/inc/tg_ext.mk
Dosyayı görüntüle @ 4b154172
......@@ -146,22 +146,22 @@ $(MISC)/%.unpack : $(TARFILE_LOCATION2)/%.tar
$(MISC)/%.unpack : $(TARFILE_LOCATION2)/%.zip
@-$(RM) $@
@noop $(assign UNPACKCMD := cd .. && unzip $(unzip_quiet_switch) -o $(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).zip)
@noop $(assign UNPACKCMD := unzip $(unzip_quiet_switch) -o $(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).zip)
@$(TYPE) $(mktmp $(UNPACKCMD)) > $@.$(INPATH)
@$(RENAME) $@.$(INPATH) $@
$(MISC)/%.unpack : $(TARFILE_LOCATION2)/%.oxt
@-$(RM) $@
@noop $(assign UNPACKCMD := cd .. && unzip $(unzip_quiet_switch) -o $(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).oxt)
@noop $(assign UNPACKCMD := unzip $(unzip_quiet_switch) -o $(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).oxt)
@$(TYPE) $(mktmp $(UNPACKCMD)) > $@.$(INPATH)
@$(RENAME) $@.$(INPATH) $@
$(MISC)/%.unpack : $(TARFILE_LOCATION2)/%.jar
@-$(RM) $@
.IF "$(OS)"=="SOLARIS"
@noop $(assign UNPACKCMD := cd .. && jar xf $(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).jar)
@noop $(assign UNPACKCMD := jar xf $(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).jar)
.ELSE # "$(OS)"=="SOLARIS"
@noop $(assign UNPACKCMD := cd .. && unzip $(unzip_quiet_switch) -o $(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).jar)
@noop $(assign UNPACKCMD := unzip $(unzip_quiet_switch) -o $(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).jar)
.ENDIF # "$(OS)"=="SOLARIS"
@$(TYPE) $(mktmp $(UNPACKCMD)) > $@.$(INPATH)
@$(RENAME) $@.$(INPATH) $@
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment