diff options
| author | Ingo Schmidt <is@openoffice.org> | 2010-06-04 11:05:31 +0200 |
|---|---|---|
| committer | Ingo Schmidt <is@openoffice.org> | 2010-06-04 11:05:31 +0200 |
| commit | 5505fa96623051b9bd8584d5f20da50916741e2d (patch) | |
| tree | 7b460d8f152ae823b4ad181fc1d05040d83b0aa9 /instsetoo_native | |
| parent | ff94b38b00f90b4fbc8f49d132d46f27c537e143 (diff) | |
native306 #i111497,i111501# Patches for MacOSX Python from Cloph
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) $< $@ |