From df20a603da45e041abe228d4ffc0bf940b70dded Mon Sep 17 00:00:00 2001 From: Oliver Bolte Date: Wed, 20 Apr 2005 10:35:49 +0000 Subject: [PATCH] INTEGRATION: CWS nativefixer6 (1.11.2); FILE MERGED 2005/04/12 06:36:29 obr 1.11.2.1: moved /usr/bin/soffice link to desktop integration packages --- sysui/desktop/redhat/makefile.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sysui/desktop/redhat/makefile.mk b/sysui/desktop/redhat/makefile.mk index 7e3b8615c018..4d382710bbfb 100644 --- a/sysui/desktop/redhat/makefile.mk +++ b/sysui/desktop/redhat/makefile.mk @@ -156,6 +156,7 @@ PKGNAME=$(shell sed -n -e 's/^Name: //p' $(TARGET)-menus.spec) RPMFILE=$(BIN)/noarch/$(PKGNAME)-$(PKGVERSION)-$(PKGREV).noarch.rpm RPMDEPN = \ $(MISC)/$(TARGET)/etc/$(UNIXFILENAME) \ + $(MISC)/$(TARGET)/usr/bin/soffice \ $(MISC)/$(TARGET)/usr/bin/$(UNIXFILENAME) \ $(MISC)/$(TARGET)/usr/bin/$(UNIXFILENAME)-printeradmin \ $(MISC)/$(TARGET)/usr/share/applications/{$(LAUNCHERDEPN)} \ @@ -245,6 +246,10 @@ $(MISC)/$(TARGET)/usr/bin/$(UNIXFILENAME)-printeradmin : ../share/printeradmin.s @$(MKDIRHIER) $(@:d) @cat $< | tr -d "\015" | sed -e "s/%PREFIX/$(UNIXFILENAME)/g" > $@ +$(MISC)/$(TARGET)/usr/bin/soffice : + @$(MKDIRHIER) $(@:d) + @ln -sf /etc/$(UNIXFILENAME)/program/soffice $@ + $(MISC)/$(TARGET)/etc/$(UNIXFILENAME) : @$(MKDIRHIER) $(@:d) @touch $@