summaryrefslogtreecommitdiff
path: root/solenv/inc/tg_ext.mk
diff options
context:
space:
mode:
Diffstat (limited to 'solenv/inc/tg_ext.mk')
-rw-r--r--solenv/inc/tg_ext.mk10
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) $@