[Libreoffice-commits] .: solenv/inc

[Lionel Elie Mamane]

 solenv/inc/tg_ext.mk |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

New commits:
commit 58844404ad9c9da806b9b521d5e39af6cf78b480
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date:   Fri Dec 9 00:37:05 2011 +0100

    tg_ext: fix unpack for flat zip files

diff --git a/solenv/inc/tg_ext.mk b/solenv/inc/tg_ext.mk
index f31c340..a6335a5 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) $@