diff options
| author | Lionel Elie Mamane <lionel@mamane.lu> | 2011-12-09 01:17:13 +0100 |
|---|---|---|
| committer | Lionel Elie Mamane <lionel@mamane.lu> | 2011-12-09 01:17:13 +0100 |
| commit | 0fe6184dc32e822ee7f6a082ece9ca3efbf685b3 (patch) | |
| tree | 8cb5ac0b1656b315a1e3cf56806e5961218970b4 /solenv/inc/tg_ext.mk | |
| parent | c58f776fb8600ba9ccef9a999db37b8448f22ad0 (diff) | |
Revert "tg_ext: fix unpack for flat zip files"
This reverts commit 58844404ad9c9da806b9b521d5e39af6cf78b480.
Diffstat (limited to 'solenv/inc/tg_ext.mk')
| -rw-r--r-- | solenv/inc/tg_ext.mk | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/solenv/inc/tg_ext.mk b/solenv/inc/tg_ext.mk index a6335a510f10..f31c340c767b 100644 --- a/solenv/inc/tg_ext.mk +++ b/solenv/inc/tg_ext.mk @@ -58,10 +58,8 @@ fake_root_dir=/$(TARFILE_ROOTDIR) #MUST match fake_root_dir in directory levels fake_back=../ .IF "$(TARFILE_IS_FLAT)" != "" -zip_dir=. TAR_STRIP_LEVEL=0 .ELSE -zip_dir=.. TAR_STRIP_LEVEL=1 .ENDIF "$(TARFILE_IS_FLAT)" != "" @@ -148,22 +146,22 @@ $(MISC)/%.unpack : $(TARFILE_LOCATION2)/%.tar $(MISC)/%.unpack : $(TARFILE_LOCATION2)/%.zip @-$(RM) $@ - @noop $(assign UNPACKCMD := cd $(zip_dir) && unzip $(unzip_quiet_switch) -o $(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).zip) + @noop $(assign UNPACKCMD := cd .. && 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 $(zip_dir) && unzip $(unzip_quiet_switch) -o $(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).oxt) + @noop $(assign UNPACKCMD := cd .. && 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 $(zip_dir) && jar xf $(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).jar) + @noop $(assign UNPACKCMD := cd .. && jar xf $(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).jar) .ELSE # "$(OS)"=="SOLARIS" - @noop $(assign UNPACKCMD := cd $(zip_dir) && unzip $(unzip_quiet_switch) -o $(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).jar) + @noop $(assign UNPACKCMD := cd .. && unzip $(unzip_quiet_switch) -o $(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).jar) .ENDIF # "$(OS)"=="SOLARIS" @$(TYPE) $(mktmp $(UNPACKCMD)) > $@.$(INPATH) @$(RENAME) $@.$(INPATH) $@ |