diff options
| author | Oliver Bolte <obo@openoffice.org> | 2005-04-20 10:36:37 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2005-04-20 10:36:37 +0000 |
| commit | ce78b945d576166ab3bf9879506a3a76bea0806a (patch) | |
| tree | ee74782ed0075e1ac935fec8f760c43a1c550f38 | |
| parent | 89d0b3ac00db673cd4204f591cbaab05aa118fcd (diff) | |
INTEGRATION: CWS nativefixer6 (1.12.2); FILE MERGED
2005/04/12 06:36:28 obr 1.12.2.1: moved /usr/bin/soffice link to desktop integration packages
| -rw-r--r-- | sysui/desktop/suse/makefile.mk | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sysui/desktop/suse/makefile.mk b/sysui/desktop/suse/makefile.mk index aa3d17f2c60c..23d92aa29b27 100644 --- a/sysui/desktop/suse/makefile.mk +++ b/sysui/desktop/suse/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)} \ @@ -244,6 +245,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 $@ |