diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2005-06-21 14:03:46 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2005-06-21 14:03:46 +0000 |
| commit | 40a86ec96859c44eac3444704be3110ea2d72575 (patch) | |
| tree | ede9c1d25d5df38d3a7bc31e91f6494fd819d847 /sysui | |
| parent | a2896f14787d5d2cc43d2e26c63615268fb45516 (diff) | |
INTEGRATION: CWS sysui08 (1.5.8); FILE MERGED
2005/06/20 11:57:53 obr 1.5.8.1: #i48992# debian menu integration
Diffstat (limited to 'sysui')
| -rw-r--r-- | sysui/desktop/share/makefile.mk | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/sysui/desktop/share/makefile.mk b/sysui/desktop/share/makefile.mk index be7eb152b323..28a03dad6fb8 100644 --- a/sysui/desktop/share/makefile.mk +++ b/sysui/desktop/share/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.5 $ +# $Revision: 1.6 $ # -# last change: $Author: hr $ $Date: 2005-06-06 16:26:21 $ +# last change: $Author: rt $ $Date: 2005-06-21 15:03:46 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -86,19 +86,18 @@ ULFFILES= \ launcher_comment.ulf \ launcher_name.ulf -DESTULFFILES=$(foreach,i,$(ULFFILES) $(COMMONMISC)$/$(TARGET)$/$i) - LAUNCHERLIST = writer calc draw impress math base printeradmin LAUNCHERDEPN = ../menus/{$(LAUNCHERLIST)}.desktop LAUNCHERFLAGFILE = $(COMMONMISC)/$(TARGET)/xdg.flag +MIMEINFO = $(COMMONMISC)/$(TARGET)/openoffice.org.xml # --- Targets ------------------------------------------------------ .INCLUDE : target.mk .IF "$(GUI)"=="UNX" -ALLTAR : $(LAUNCHERFLAGFILE) $(DESTULFFILES) +ALLTAR : $(LAUNCHERFLAGFILE) $(MIMEINFO) .ENDIF # "$(GUI)"=="UNIX" # @@ -118,3 +117,12 @@ $(LAUNCHERFLAGFILE) : $(LAUNCHERDEPN) ../productversion.mk brand.pl translate.pl @mv -f $(@:db).$(INPATH)/* $(@:d) @touch $@ +# +# Merge translations from documents.ulf into shared-mime-info stub +# +$(MIMEINFO) : $(COMMONMISC)$/$(TARGET)$/documents.ulf $$(@:f) + @echo Merging translations into shared mime info .. + @echo --------------------------------- + @$(PERL) merge-shared-mime-translations.pl -p "OpenOffice.org" -u $< > $(@).$(INPATH) + @mv -f $(@).$(INPATH) $@ + |