diff options
| author | Kurt Zenker <kz@openoffice.org> | 2007-02-15 15:46:07 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2007-02-15 15:46:07 +0000 |
| commit | 600b8ff8ba0891474449f611885fc9b8e158c0cc (patch) | |
| tree | 54eef297e29c88190b7efaa57e555415eb99ced1 /sysui/desktop/mandriva | |
| parent | 78ebd532e4a8ad0b37ea9f9e39b0b625b67bd1dd (diff) | |
INTEGRATION: CWS sysui13_SRC680 (1.11.18); FILE MERGED
2007/02/15 10:14:25 obr 1.11.18.1: #i74533# eliminated unnecessary unopkg_gui script
Diffstat (limited to 'sysui/desktop/mandriva')
| -rw-r--r-- | sysui/desktop/mandriva/makefile.mk | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/sysui/desktop/mandriva/makefile.mk b/sysui/desktop/mandriva/makefile.mk index d0a218293ed8..c4c11f7af94a 100644 --- a/sysui/desktop/mandriva/makefile.mk +++ b/sysui/desktop/mandriva/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.12 $ +# $Revision: 1.13 $ # -# last change: $Author: obo $ $Date: 2007-01-25 15:34:00 $ +# last change: $Author: kz $ $Date: 2007-02-15 16:46:07 $ # # 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 \ @@ -224,17 +223,6 @@ $(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 $@ |