summaryrefslogtreecommitdiff
path: root/sysui
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2007-02-15 15:48:31 +0000
committerKurt Zenker <kz@openoffice.org>2007-02-15 15:48:31 +0000
commit0212ebb0daf4005b21e95cdf4e6495b985dd0ee3 (patch)
treee9082412815bbf11fdeb9675622bc929001ea3cd /sysui
parent613c3c5ab49b5a0697010226377c8725dd344fe9 (diff)
INTEGRATION: CWS sysui13_SRC680 (1.22.18); FILE MERGED
2007/02/15 10:14:27 obr 1.22.18.1: #i74533# eliminated unnecessary unopkg_gui script
Diffstat (limited to 'sysui')
-rw-r--r--sysui/desktop/redhat/makefile.mk15
1 files changed, 2 insertions, 13 deletions
diff --git a/sysui/desktop/redhat/makefile.mk b/sysui/desktop/redhat/makefile.mk
index 04799379addf..84c6704d0131 100644
--- a/sysui/desktop/redhat/makefile.mk
+++ b/sysui/desktop/redhat/makefile.mk
@@ -4,9 +4,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.23 $
+# $Revision: 1.24 $
#
-# last change: $Author: obo $ $Date: 2007-01-25 15:34:13 $
+# last change: $Author: kz $ $Date: 2007-02-15 16:48:31 $
#
# The Contents of this file are made available subject to
# the terms of GNU Lesser General Public License Version 2.1.
@@ -130,7 +130,6 @@ 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 \
@@ -228,16 +227,6 @@ $(MISC)/$(TARGET)/usr/bin/soffice :
@$(MKDIRHIER) $(@:d)
@ln -sf /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 -sf /etc/$(UNIXFILENAME)/program/unopkg $@