diff options
| author | obo <obo@openoffice.org> | 2010-06-09 17:18:22 +0200 |
|---|---|---|
| committer | obo <obo@openoffice.org> | 2010-06-09 17:18:22 +0200 |
| commit | f7e4804809575d33cda21fe5870782b599af01ac (patch) | |
| tree | bd4f537e84a48050759d76ed0c0ceba548fd4a18 /instsetoo_native | |
| parent | 97f95c2bfdd9433c7700fef2eb06d16c2739e2cf (diff) | |
| parent | 5505fa96623051b9bd8584d5f20da50916741e2d (diff) | |
CWS-TOOLING: integrate CWS native306
Diffstat (limited to 'instsetoo_native')
| -rw-r--r-- | instsetoo_native/util/makefile.mk | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk index b2f014f6ad58..28b9c33628c5 100644 --- a/instsetoo_native/util/makefile.mk +++ b/instsetoo_native/util/makefile.mk @@ -279,24 +279,12 @@ openoffice: .ENDIF # "$(alllangiso)"!="" .IF "$(LOCALPYFILES)"!="" -$(foreach,i,$(alllangiso) openoffice_$i{$(PKGFORMAT:^".") .archive} openofficewithjre_$i{$(PKGFORMAT:^".")} openofficedev_$i{$(PKGFORMAT:^".")} broffice_$i{$(PKGFORMAT:^".")} brofficewithjre_$i{$(PKGFORMAT:^".")} brofficedev_$i{$(PKGFORMAT:^".")} sdkoo_$i{$(PKGFORMAT:^".")}) updatepack : $(LOCALPYFILES) $(BIN)$/cp1251.py $(BIN)$/iso8859_1.py +$(foreach,i,$(alllangiso) openoffice_$i{$(PKGFORMAT:^".") .archive} openofficewithjre_$i{$(PKGFORMAT:^".")} openofficedev_$i{$(PKGFORMAT:^".")} broffice_$i{$(PKGFORMAT:^".")} brofficewithjre_$i{$(PKGFORMAT:^".")} brofficedev_$i{$(PKGFORMAT:^".")} sdkoo_$i{$(PKGFORMAT:^".")}) updatepack : $(LOCALPYFILES) .ENDIF # "$(LOCALPYFILES)"!="" $(BIN)$/%.py : $(SOLARSHAREDBIN)$/pyuno$/%.py @$(COPY) $< $@ -.IF "$(SYSTEM_PYTHON)" != "YES" -$(BIN)$/cp1251.py : $(SOLARLIBDIR)$/python$/encodings$/cp1251.py - @$(COPY) $< $@ -$(BIN)$/iso8859_1.py : $(SOLARLIBDIR)$/python$/encodings$/iso8859_1.py - @$(COPY) $< $@ -.ELSE -$(BIN)$/cp1251.py : - @echo "Using system python - nothing more to do here" -$(BIN)$/iso8859_1.py : - @echo "Using system python - nothing more to do here" -.ENDIF - $(BIN)$/intro.zip : $(SOLARCOMMONPCKDIR)$/openoffice_nologo$/intro.zip $(COPY) $< $@ |