diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2006-12-19 10:28:11 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2006-12-19 10:28:11 +0000 |
| commit | 674af5c0417b3da31593050ec69d9f8bd332313f (patch) | |
| tree | ad5c145603b4ce4ec982af86f7a9c02fd45cccbf /sysui | |
| parent | 943326fd90bb42bb28198fcb48659609ec79480f (diff) | |
INTEGRATION: CWS jl46 (1.13.2); FILE MERGED
2006/12/04 15:53:02 jl 1.13.2.4: RESYNC: (1.13-1.14); FILE MERGED
2006/11/27 15:53:43 ihi 1.13.2.3: #i69173# Systemintegration for Extensions
2006/11/17 14:55:06 ihi 1.13.2.2: buildfix
2006/11/16 18:52:28 ihi 1.13.2.1: #i69173# Systemintegration for Extensions
Diffstat (limited to 'sysui')
| -rw-r--r-- | sysui/desktop/share/makefile.mk | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/sysui/desktop/share/makefile.mk b/sysui/desktop/share/makefile.mk index da7e9510ca37..9c481c59b4f5 100644 --- a/sysui/desktop/share/makefile.mk +++ b/sysui/desktop/share/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.14 $ +# $Revision: 1.15 $ # -# last change: $Author: kz $ $Date: 2006-11-08 11:55:36 $ +# last change: $Author: ihi $ $Date: 2006-12-19 11:28:11 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -66,11 +66,12 @@ ULFFILES= \ launcher_comment.ulf \ launcher_name.ulf -LAUNCHERLIST = writer calc draw impress math base printeradmin qstart +LAUNCHERLIST = writer calc draw impress math base printeradmin qstart extension LAUNCHERDEPN = ../menus/{$(LAUNCHERLIST)}.desktop LAUNCHERFLAGFILE = $(COMMONMISC)/$(TARGET)/xdg.flag MIMEINFO = $(COMMONMISC)/$(TARGET)/openoffice.org.xml +#UNOPKGWRAPPER = $(COMMONMISC)/$(TARGET)/unopkg_gui .IF "$(PKGFORMAT)"!="$(PKGFORMAT:s/rpm//)" SPECFILES = \ @@ -85,7 +86,7 @@ SPECFILES = \ .INCLUDE : target.mk .IF "$(GUI)"=="UNX" -ALLTAR : $(LAUNCHERFLAGFILE) $(MIMEINFO) $(SPECFILES) +ALLTAR : $(LAUNCHERFLAGFILE) $(MIMEINFO) $(SPECFILES) $(UNOPKGWRAPPER) .ENDIF # "$(GUI)"=="UNIX" # @@ -102,7 +103,7 @@ $(LAUNCHERFLAGFILE) : $(LAUNCHERDEPN) ../productversion.mk brand.pl translate.pl .IF "$(WITH_LIBSN)"=="YES" @noop x$(foreach,i,$(LAUNCHERLIST) $(shell +echo "StartupNotify=true" >> $(@:db).$(INPATH)/$i.desktop))x .ENDIF - @mv -f $(@:db).$(INPATH)/* $(@:d) + mv -f $(@:db).$(INPATH)/* $(@:d) @touch $@ # @@ -115,6 +116,9 @@ $(MIMEINFO) : $(ULFDIR)$/documents.ulf @$(PERL) create_mime_xml.pl $< > $(@).$(INPATH) @mv -f $(@).$(INPATH) $@ +#$(UNOPKGWRAPPER) : unopkg_gui +# @cp -f unopkg_gui $(COMMONMISC)/$(TARGET)/unopkg_gui + .IF "$(PKGFORMAT)"!="$(PKGFORMAT:s/rpm//)" $(SPECFILES) : add_specfile_triggers.sed symlink_triggers $(SPECFILES) : ../$$(@:b:s/-menus//)/$$(@:f) |