summaryrefslogtreecommitdiff
path: root/sysui
diff options
context:
space:
mode:
authorIvo Hinkelmann <ihi@openoffice.org>2006-12-19 10:26:12 +0000
committerIvo Hinkelmann <ihi@openoffice.org>2006-12-19 10:26:12 +0000
commit8947ad90cbd7127ce8a46b513d4d98be8c63b6a1 (patch)
treee5763a0d8168c236dad529b443f5520c21ab2ed0 /sysui
parent3a391c5c7154f8044a29f4c2f23335070a955d90 (diff)
INTEGRATION: CWS jl46 (1.9.44); FILE MERGED
2006/12/12 21:02:16 ihi 1.9.44.5: Extension support for solaris 2006/12/04 15:52:33 jl 1.9.44.4: RESYNC: (1.9-1.10); FILE MERGED 2006/11/27 15:53:41 ihi 1.9.44.3: #i69173# Systemintegration for Extensions 2006/11/16 18:52:26 ihi 1.9.44.2: #i69173# Systemintegration for Extensions 2006/10/17 12:56:07 ihi 1.9.44.1: #i69173# Systemintegration for Extensions
Diffstat (limited to 'sysui')
-rw-r--r--sysui/desktop/mandriva/makefile.mk32
1 files changed, 26 insertions, 6 deletions
diff --git a/sysui/desktop/mandriva/makefile.mk b/sysui/desktop/mandriva/makefile.mk
index 9304a525a739..fa09eca36228 100644
--- a/sysui/desktop/mandriva/makefile.mk
+++ b/sysui/desktop/mandriva/makefile.mk
@@ -4,9 +4,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.10 $
+# $Revision: 1.11 $
#
-# last change: $Author: kz $ $Date: 2006-11-08 11:55:08 $
+# last change: $Author: ihi $ $Date: 2006-12-19 11:26:12 $
#
# The Contents of this file are made available subject to
# the terms of GNU Lesser General Public License Version 2.1.
@@ -52,7 +52,7 @@ TARGET=mandriva
# GNOME does not like icon names with more than one '.'
ICONPREFIX = $(UNIXFILENAME:s/.//g)
-LAUNCHERLIST = writer calc draw impress math base printeradmin
+LAUNCHERLIST = writer calc draw impress math base printeradmin extension
LAUNCHERDEPN = $(foreach,i,$(LAUNCHERLIST) $(UNIXFILENAME)-$i.desktop)
LAUNCHERDIR = $(ABSLOCALOUT)$/misc$/$(TARGET)
@@ -78,7 +78,8 @@ MIMELIST = \
oasis-formula \
oasis-master-document \
oasis-database \
- oasis-web-template
+ oasis-web-template \
+ extension
MIMEICONLIST = \
oasis-text \
@@ -103,7 +104,8 @@ MIMEICONLIST = \
presentation-template \
formula \
master-document \
- database
+ database \
+ extension
GNOMEMIMEDEPN = ../mimetypes/{$(MIMELIST)}.keys ../mimetypes/openoffice.mime
KDEMIMEDEPN = ../mimetypes/{$(MIMELIST)}.desktop
@@ -128,6 +130,8 @@ RPMFILE=$(PKGDIR)$/$(PKGNAME)-$(PKGVERSION)-$(PKGREV).noarch.rpm
RPMDEPN = \
$(MISC)/$(TARGET)/etc/$(UNIXFILENAME) \
$(MISC)/$(TARGET)/usr/bin/soffice \
+ $(MISC)/$(TARGET)/usr/bin/unopkg_gui \
+ $(MISC)/$(TARGET)/usr/bin/unopkg \
$(MISC)/$(TARGET)/usr/bin/$(UNIXFILENAME) \
$(MISC)/$(TARGET)/usr/bin/$(UNIXFILENAME)-printeradmin \
$(MISC)/$(TARGET)/usr/share/applications/{$(LAUNCHERDEPN)} \
@@ -203,7 +207,7 @@ $(MISC)/$(TARGET)/usr/share/application-registry/$(UNIXFILENAME).applications :
@$(MKDIRHIER) $(@:d)
@echo Creating GNOME .applications file ..
@echo ---------------------------------
- @cat ../mimetypes/openoffice.applications | tr -d "\015" | sed -e "s/openoffice/$(UNIXFILENAME)/" -e "s/%PRODUCTNAME/$(LONGPRODUCTNAME)/" > $@
+ @cat ../mimetypes/openoffice.applications | tr -d "\015" | sed -e "s/OFFICENAME/$(UNIXFILENAME)/" -e "s/%PRODUCTNAME/$(LONGPRODUCTNAME)/" > $@
# --- script ------------------------------------------------------
@@ -211,6 +215,7 @@ $(MISC)/$(TARGET)/usr/bin/$(UNIXFILENAME) : ../share/openoffice.sh
@$(MKDIRHIER) $(@:d)
@cat $< | tr -d "\015" | sed -e "s/%PREFIX/$(UNIXFILENAME)/g" > $@
+
$(MISC)/$(TARGET)/usr/bin/$(UNIXFILENAME)-printeradmin : ../share/printeradmin.sh
@$(MKDIRHIER) $(@:d)
@cat $< | tr -d "\015" | sed -e "s/%PREFIX/$(UNIXFILENAME)/g" > $@
@@ -219,6 +224,21 @@ $(MISC)/$(TARGET)/usr/bin/soffice :
@$(MKDIRHIER) $(@:d)
@ln -svf /etc/$(UNIXFILENAME)/program/soffice $@
+
+#Create the unopkg wrapper
+$(MISC)/$(TARGET)/opt/$(UNIXFILENAME)/program/unopkg_gui :
+ @$(MKDIRHIER) $(@:d)
+ echo \#\!\/bin\/sh > $@
+ echo exec unopkg gui \$$@ >> $@
+
+$(MISC)/$(TARGET)/usr/bin/unopkg_gui : $(MISC)/$(TARGET)/opt/$(UNIXFILENAME)/program/unopkg_gui
+ @$(MKDIRHIER) $(@:d)
+ @ln -sf /etc/$(UNIXFILENAME)/program/unopkg_gui $@
+
+$(MISC)/$(TARGET)/usr/bin/unopkg :
+ @$(MKDIRHIER) $(@:d)
+ @ln -svf /etc/$(UNIXFILENAME)/program/unopkg $@
+
$(MISC)/$(TARGET)/etc/$(UNIXFILENAME) :
@$(MKDIRHIER) $(@:d)
@touch $@