diff options
| author | sb <sb@openoffice.org> | 2010-01-13 22:30:41 +0100 |
|---|---|---|
| committer | sb <sb@openoffice.org> | 2010-01-13 22:30:41 +0100 |
| commit | 61f2eb6209c772edcdbae6fc47c610c5d6fb5cf7 (patch) | |
| tree | c2601fded81e570f49598abf7230ea5c1dfd34a2 /smoketestoo_native | |
| parent | 55698fbc3f556306a7c707638e6d359b300ec833 (diff) | |
sb118: smoketestoo_native installation depends on installation archive file
Diffstat (limited to 'smoketestoo_native')
| -rw-r--r-- | smoketestoo_native/makefile.mk | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/smoketestoo_native/makefile.mk b/smoketestoo_native/makefile.mk index caba56802f44..541cfea9aa46 100644 --- a/smoketestoo_native/makefile.mk +++ b/smoketestoo_native/makefile.mk @@ -81,8 +81,9 @@ smoketest .PHONY: $(MISC)/installation.flag $(SHL1TARGETN) \ # installing into the temp directory instead of the module output tree (in which # case installation.flag contains the path to the temp installation, which is # removed after smoketest); can be removed once issue 50885 is fixed: -$(MISC)/installation.flag: .IF "$(OS)" == "WNT" +$(MISC)/installation.flag: $(shell ls \ + $(SRC_ROOT)/instsetoo_native/$(INPATH)/OpenOffice/archive/install/$(defaultlangiso)/OOo_*_install.zip) my_tmp=$$(cygpath -m $$(mktemp -dt ooosmoke.XXXXXX)) && \ unzip \ $(SRC_ROOT)/instsetoo_native/$(INPATH)/OpenOffice/archive/install/$(defaultlangiso)/OOo_*_install.zip \ @@ -90,6 +91,8 @@ $(MISC)/installation.flag: mv "$$my_tmp"/OOo_*_install "$$my_tmp"/opt && \ echo "$$my_tmp" > $@ .ELSE +$(MISC)/installation.flag: $(shell ls \ + $(SRC_ROOT)/instsetoo_native/$(INPATH)/OpenOffice/archive/install/$(defaultlangiso)/OOo_*_install.tar.gz) $(RM) -r $(MISC)/installation $(MKDIR) $(MISC)/installation cd $(MISC)/installation && $(GNUTAR) xfz \ |