From bf0d208958fcf37106d09913fdfca724d684be41 Mon Sep 17 00:00:00 2001 From: Kurt Zenker Date: Thu, 15 Feb 2007 15:49:50 +0000 Subject: [PATCH] INTEGRATION: CWS sysui13_SRC680 (1.14.2.1.6); FILE MERGED 2007/02/15 10:14:27 obr 1.14.2.1.6.1: #i74533# eliminated unnecessary unopkg_gui script --- sysui/desktop/solaris/makefile.mk | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/sysui/desktop/solaris/makefile.mk b/sysui/desktop/solaris/makefile.mk index 85e4127561f4..46522243cfb6 100644 --- a/sysui/desktop/solaris/makefile.mk +++ b/sysui/desktop/solaris/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.15 $ +# $Revision: 1.16 $ # -# last change: $Author: obo $ $Date: 2007-01-22 14:33:31 $ +# last change: $Author: kz $ $Date: 2007-02-15 16:49:50 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -83,7 +83,6 @@ PKGDEPN = \ $(MISC)/$(TARGET)/openoffice.mime \ $(MISC)/$(TARGET)/openoffice.keys \ $(MISC)/$(TARGET)/printeradmin.sh \ - $(MISC)/$(TARGET)/etc/$(UNIXFILENAME)/program/unopkg_gui \ $(MISC)/$(TARGET)/openoffice.sh \ $(MISC)/$(TARGET)/space \ $(MISC)/$(TARGET)/depend \ @@ -142,16 +141,6 @@ $(MISC)/$(TARGET)/openoffice.applications : ../productversion.mk ../mimetypes/op @echo --------------------------------- @cat ../mimetypes/openoffice.applications | tr -d "\015" | sed -e "s/OFFICENAME/$(UNIXFILENAME)/" -e "s/%PRODUCTNAME/$(LONGPRODUCTNAME)/" > $@ -# Create the unopkg wrapper -$(MISC)/$(TARGET)/etc/$(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 $@ - # --- pkginfo ---------------------------------------------------- # Copy the pkginfo file to $(MISC)