summaryrefslogtreecommitdiff
path: root/sysui/desktop
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2008-05-15 08:09:41 +0000
committerVladimir Glazounov <vg@openoffice.org>2008-05-15 08:09:41 +0000
commitc355054aad58dcf3c631a9601766ee40467ca2d3 (patch)
tree07db9d5b6b98585a0de9b0dd165249f7a03a8be8 /sysui/desktop
parent2d0a6c9d459e940e6fdda07de61d08b0f672a405 (diff)
INTEGRATION: CWS oxtsysint01 (1.4.4); FILE MERGED
2008/04/24 04:46:39 obr 1.4.4.1: #i88403# used wrong variable
Diffstat (limited to 'sysui/desktop')
-rw-r--r--sysui/desktop/macosx/makefile.mk13
1 files changed, 4 insertions, 9 deletions
diff --git a/sysui/desktop/macosx/makefile.mk b/sysui/desktop/macosx/makefile.mk
index a50f624cf5a2..fa1bf884f949 100644
--- a/sysui/desktop/macosx/makefile.mk
+++ b/sysui/desktop/macosx/makefile.mk
@@ -8,7 +8,7 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.4 $
+# $Revision: 1.5 $
#
# This file is part of OpenOffice.org.
#
@@ -68,7 +68,6 @@ CWS=[CWS:$(CWS_WORK_STAMP)]
ULFDIR:=$(COMMONMISC)$/desktopshare
.ELSE # "$(WITH_LANG)"!=""
ULFDIR:=..$/share
-WITH_LANG *= en-US # Fallback for configure w/o --with-lang switch
.ENDIF # "$(WITH_LANG)"!=""
# --- Targets --------------------------------------------------
@@ -77,11 +76,7 @@ WITH_LANG *= en-US # Fallback for configure w/o --with-lang switch
ZIP1TARGETN : Info.plist extract_icons_names.pl
-ALLTAR : $(COMMONMISC)$/{PkgInfo Info.plist}
-
-.IF "$(WITH_LANG)"!=""
-ALLTAR : $(COMMONBIN)$/InfoPlist_{$(WITH_LANG)}.zip
-.ENDIF
+ALLTAR : $(COMMONMISC)$/{PkgInfo Info.plist} $(COMMONBIN)$/InfoPlist_{$(alllangiso)}.zip
$(COMMONMISC)$/PkgInfo :
echo "APPL$(CREATOR_TYPE)" > $@
@@ -90,11 +85,11 @@ $(COMMONMISC)$/PkgInfo :
$(COMMONMISC)$/Info.plist : $$(@:f)
sed -e "s|\%EXECUTABLE|${EXECUTABLE}|g" -e "s|\%SOURCE|[$(SOURCE)$(CWS)]|g" $< > $@
-$(COMMONBIN)$/InfoPlist_{$(WITH_LANG)}.zip : $(COMMONMISC)$/$$(@:b)/InfoPlist.strings
+$(COMMONBIN)$/InfoPlist_{$(alllangiso)}.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
+$(COMMONMISC)$/InfoPlist_{$(alllangiso)}$/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) $@