diff options
| author | sb <sb@openoffice.org> | 2010-01-29 17:01:54 +0100 |
|---|---|---|
| committer | sb <sb@openoffice.org> | 2010-01-29 17:01:54 +0100 |
| commit | bdd7a0f37c4f280e27289079129b8136d0befef2 (patch) | |
| tree | f783dbbc057d96a99952e38b207af8ce3125d668 /smoketestoo_native/makefile.mk | |
| parent | 947441fda5c7a99ec42afa3b94961d05356c04d8 (diff) | |
sb118: #i108776# changed addsym.awk to also export STLport num_put symbols, and simplified it by requiring that first section is labeled UDK_3_0_0; adapted map files accordingly, replacing many individual ones with solenv/src templates
Diffstat (limited to 'smoketestoo_native/makefile.mk')
| -rw-r--r-- | smoketestoo_native/makefile.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/smoketestoo_native/makefile.mk b/smoketestoo_native/makefile.mk index e104f5feb648..e1045d69c22d 100644 --- a/smoketestoo_native/makefile.mk +++ b/smoketestoo_native/makefile.mk @@ -83,20 +83,20 @@ smoketest .PHONY: $(MISC)/installation.flag $(SHL1TARGETN) \ # removed after smoketest); can be removed once issue 50885 is fixed: .IF "$(OS)" == "WNT" $(MISC)/installation.flag: $(shell ls \ - $(SRC_ROOT)/instsetoo_native/$(INPATH)/OpenOffice/archive/install/$(defaultlangiso)/OOo_*_install.zip) + $(SOLARSRC)/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 \ + $(SOLARSRC)/instsetoo_native/$(INPATH)/OpenOffice/archive/install/$(defaultlangiso)/OOo_*_install.zip \ -d "$$my_tmp" && \ 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) + $(SOLARSRC)/instsetoo_native/$(INPATH)/OpenOffice/archive/install/$(defaultlangiso)/OOo_*_install.tar.gz) $(RM) -r $(MISC)/installation $(MKDIR) $(MISC)/installation cd $(MISC)/installation && $(GNUTAR) xfz \ - $(SRC_ROOT)/instsetoo_native/$(INPATH)/OpenOffice/archive/install/$(defaultlangiso)/OOo_*_install.tar.gz + $(SOLARSRC)/instsetoo_native/$(INPATH)/OpenOffice/archive/install/$(defaultlangiso)/OOo_*_install.tar.gz $(MV) $(MISC)/installation/OOo_*_install $(MISC)/installation/opt $(TOUCH) $@ .END |