diff options
| author | Lionel Elie Mamane <lionel@mamane.lu> | 2011-12-09 00:37:05 +0100 |
|---|---|---|
| committer | Lionel Elie Mamane <lionel@mamane.lu> | 2011-12-09 00:37:38 +0100 |
| commit | 58844404ad9c9da806b9b521d5e39af6cf78b480 (patch) | |
| tree | 57c28aeaf362e99cf5b2bdcba70c49eb7cd4408f | |
| parent | ce2fe82b08026238573867ff4baeb99fb33cb698 (diff) | |
tg_ext: fix unpack for flat zip files
| -rw-r--r-- | solenv/inc/tg_ext.mk | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/solenv/inc/tg_ext.mk b/solenv/inc/tg_ext.mk index f31c340c767b..a6335a510f10 100644 --- a/solenv/inc/tg_ext.mk +++ b/solenv/inc/tg_ext.mk @@ -58,8 +58,10 @@ 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)" != "" @@ -146,22 +148,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 := cd $(zip_dir) && 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 := cd $(zip_dir) && 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 := cd $(zip_dir) && 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 := cd $(zip_dir) && unzip $(unzip_quiet_switch) -o $(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).jar) .ENDIF # "$(OS)"=="SOLARIS" @$(TYPE) $(mktmp $(UNPACKCMD)) > $@.$(INPATH) @$(RENAME) $@.$(INPATH) $@ |