diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2005-11-04 08:48:24 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2005-11-04 08:48:24 +0000 |
| commit | c5c4df8ab93665e37f6c3315057f34e29ad94981 (patch) | |
| tree | cd6c3c7cd001b980addcf6753450440ceb2f607f /instsetoo_native/util/makefile.mk | |
| parent | f3482bc062f69e3915592a387b64109d716699e3 (diff) | |
#i10000# iso8859_1.py has to be treated like cp1251.py (note: iso8859_1.pyc gets created by solaris builds, cp1251.pyc by windows ones).
Diffstat (limited to 'instsetoo_native/util/makefile.mk')
| -rw-r--r-- | instsetoo_native/util/makefile.mk | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk index 268af5b519fb..852b6f5b2eea 100644 --- a/instsetoo_native/util/makefile.mk +++ b/instsetoo_native/util/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.43 $ +# $Revision: 1.44 $ # -# last change: $Author: obo $ $Date: 2005-10-13 09:33:47 $ +# last change: $Author: rt $ $Date: 2005-11-04 09:48:24 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -291,9 +291,9 @@ $(MISC)$/ure$/services.rdb .ERRREMOVE: .IF "$(LOCALPYFILES)"!="" .IF "$(PKGFORMAT)"=="" -$(foreach,i,$(alllangiso) openoffice_$i openofficewithjre_$i ooolanguagepack_$i) updatepack : $(LOCALPYFILES) $(BIN)$/cp1251.py +$(foreach,i,$(alllangiso) openoffice_$i openofficewithjre_$i ooolanguagepack_$i) updatepack : $(LOCALPYFILES) $(BIN)$/cp1251.py $(BIN)$/iso8859_1.py .ELSE # "$(PKGFORMAT)"=="" -$(foreach,i,$(alllangiso) openoffice_$i{$(PKGFORMAT:^".")} openofficewithjre_$i{$(PKGFORMAT:^".")} ooolanguagepack_$i{$(PKGFORMAT:^".")}) updatepack : $(LOCALPYFILES) $(BIN)$/cp1251.py +$(foreach,i,$(alllangiso) openoffice_$i{$(PKGFORMAT:^".")} openofficewithjre_$i{$(PKGFORMAT:^".")} ooolanguagepack_$i{$(PKGFORMAT:^".")}) updatepack : $(LOCALPYFILES) $(BIN)$/cp1251.py $(BIN)$/iso8859_1.py .ENDIF # "$(PKGFORMAT)"=="" .ENDIF # "$(LOCALPYFILES)"!="" @@ -303,9 +303,13 @@ $(BIN)$/%.py : $(SOLARSHAREDBIN)$/pyuno$/%.py .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.bmp : $(SOLARCOMMONPCKDIR)$/openoffice$/nologointro.bmp |