solenv/inc/tg_ext.mk | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit fb46e93e1a85dd4c0377958cc7690eafd52d7580
Author: Lionel Elie Mamane <lio...@mamane.lu>
Date: Fri Dec 9 00:22:55 2011 +0100
tg_ext: fix unpack for zip files
diff --git a/solenv/inc/tg_ext.mk b/solenv/inc/tg_ext.mk
index e696054..f31c340 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 := 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 := 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 := 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 := 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) $@
_______________________________________________
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
