strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS jl46 (1.13.2); FILE MERGED

Browse source 
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
This commit is contained in:
Ivo Hinkelmann 2006-12-19 10:28:11 +00:00
parent 943326fd90
commit 674af5c041
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
sysui/desktop/share/makefile.mk
View file

@ -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)