diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-04-15 13:45:21 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-04-15 13:45:21 +0000 |
| commit | 5339f770c80529b560355991b5d5b38f32ae9c16 (patch) | |
| tree | 2a2e6de3beb7ec200998d19b1830c7ea25c22169 /sysui/desktop | |
| parent | 4d32fbbe832c64b13aef4891cd4dd6274b3d19c6 (diff) | |
INTEGRATION: CWS obr08 (1.2.10); FILE MERGED
2008/04/09 09:20:41 obr 1.2.10.2: Fallback for configure w/o --with-lang switch
2008/02/28 13:09:15 obr 1.2.10.1: #i85831# provide translations for OpenDocument types
Diffstat (limited to 'sysui/desktop')
| -rw-r--r-- | sysui/desktop/macosx/makefile.mk | 26 |
1 files changed, 23 insertions, 3 deletions
diff --git a/sysui/desktop/macosx/makefile.mk b/sysui/desktop/macosx/makefile.mk index e53ded5aefae..a50f624cf5a2 100644 --- a/sysui/desktop/macosx/makefile.mk +++ b/sysui/desktop/macosx/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.3 $ +# $Revision: 1.4 $ # # This file is part of OpenOffice.org. # @@ -48,7 +48,7 @@ dummy: ZIPFLAGS = -r ZIP1TARGET = osxicons ZIP1DIR = ../icons -ZIP1LIST := $(shell $(PERL) list_icons.pl < Info.plist) +ZIP1LIST := $(shell $(PERL) -w list_icons.pl < Info.plist) .IF "$(GUIBASE)"!="aqua" CREATOR_TYPE=OOo2 @@ -64,6 +64,13 @@ SOURCE=$(RSCREVISION) CWS=[CWS:$(CWS_WORK_STAMP)] .ENDIF +.IF "$(WITH_LANG)"!="" +ULFDIR:=$(COMMONMISC)$/desktopshare +.ELSE # "$(WITH_LANG)"!="" +ULFDIR:=..$/share +WITH_LANG *= en-US # Fallback for configure w/o --with-lang switch +.ENDIF # "$(WITH_LANG)"!="" + # --- Targets -------------------------------------------------- .INCLUDE : target.mk @@ -72,12 +79,25 @@ ZIP1TARGETN : Info.plist extract_icons_names.pl ALLTAR : $(COMMONMISC)$/{PkgInfo Info.plist} +.IF "$(WITH_LANG)"!="" +ALLTAR : $(COMMONBIN)$/InfoPlist_{$(WITH_LANG)}.zip +.ENDIF + $(COMMONMISC)$/PkgInfo : echo "APPL$(CREATOR_TYPE)" > $@ $(COMMONMISC)$/Info.plist : $$(@:f) - sed -e "s|\%EXECUTABLE|${EXECUTABLE}|g" -e "s|\%SOURCE|[$(SOURCE)$(CWS)]|g" $< > $@ + sed -e "s|\%EXECUTABLE|${EXECUTABLE}|g" -e "s|\%SOURCE|[$(SOURCE)$(CWS)]|g" $< > $@ + +$(COMMONBIN)$/InfoPlist_{$(WITH_LANG)}.zip : $(COMMONMISC)$/$$(@:b)/InfoPlist.strings + cd $(<:d) && zip ../$(@:f).$(INPATH) $(<:f) + $(MV) -f $(COMMONMISC)$/$(@:f).$(INPATH) $@ +$(COMMONMISC)$/InfoPlist_{$(WITH_LANG)}$/InfoPlist.strings : Info.plist $(ULFDIR)$/documents.ulf + $(MKDIRHIER) $(@:d) + $(PERL) -w gen_strings.pl -l $(@:d:d:b:s/InfoPlist_//) -p $< | iconv -f UTF-8 -t UTF-16 > $@.$(INPATH) + $(MV) -f $@.$(INPATH) $@ + .ENDIF # "$(OS)"!="MACOSX" |