diff options
| author | Lionel Elie Mamane <lionel@mamane.lu> | 2011-12-09 01:17:16 +0100 |
|---|---|---|
| committer | Lionel Elie Mamane <lionel@mamane.lu> | 2011-12-09 01:17:16 +0100 |
| commit | 4b15417268b5a8a03a9b59ebd993afeea0530f72 (patch) | |
| tree | ff285d072a20ffa1c2b3150a018ef526048ad996 /solenv | |
| parent | 0fe6184dc32e822ee7f6a082ece9ca3efbf685b3 (diff) | |
Revert "tg_ext: fix unpack for zip files"
This reverts commit fb46e93e1a85dd4c0377958cc7690eafd52d7580.
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/inc/tg_ext.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/solenv/inc/tg_ext.mk b/solenv/inc/tg_ext.mk index f31c340c767b..e6960549cbc3 100644 --- a/solenv/inc/tg_ext.mk +++ b/solenv/inc/tg_ext.mk @@ -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) $@ |