diff options
| author | Kurt Zenker <kz@openoffice.org> | 2007-02-15 15:51:16 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2007-02-15 15:51:16 +0000 |
| commit | b471e7c5adf939e387a05feccf89519b3fd43542 (patch) | |
| tree | e5ca70e03334cf1c8f058d534e5bf3bcb80b4a9a /sysui/desktop | |
| parent | 2b7a5c8bb228d4cd790ca5eaf33edbdef34f03c1 (diff) | |
INTEGRATION: CWS sysui13_SRC680 (1.23.18); FILE MERGED
2007/02/15 10:14:28 obr 1.23.18.1: #i74533# eliminated unnecessary unopkg_gui script
Diffstat (limited to 'sysui/desktop')
| -rw-r--r-- | sysui/desktop/suse/makefile.mk | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/sysui/desktop/suse/makefile.mk b/sysui/desktop/suse/makefile.mk index 179b32719c17..6052cd1ba7a8 100644 --- a/sysui/desktop/suse/makefile.mk +++ b/sysui/desktop/suse/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.24 $ +# $Revision: 1.25 $ # -# last change: $Author: obo $ $Date: 2007-01-25 15:34:26 $ +# last change: $Author: kz $ $Date: 2007-02-15 16:51:16 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -130,9 +130,7 @@ 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)/opt/$(UNIXFILENAME)/program/unopkg_gui \ $(MISC)/$(TARGET)/usr/bin/$(UNIXFILENAME) \ $(MISC)/$(TARGET)/usr/bin/$(UNIXFILENAME)-printeradmin \ $(MISC)/$(TARGET)/usr/share/applications/{$(LAUNCHERDEPN)} \ @@ -229,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 $@ |