diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-05-06 09:31:38 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-05-06 09:31:38 +0000 |
| commit | dab581a89285f0530e89f5ac9f70549bc6a0d834 (patch) | |
| tree | 6a67c77d9dc2148e6272f19909840a1600304a87 /sysui | |
| parent | e40a5c4283fd9976b3b260757c2227d13df4fd0d (diff) | |
INTEGRATION: CWS native147 (1.2.86); FILE MERGED
2008/04/23 20:26:46 obr 1.2.86.1: #i88334#,#i61569#,#i62176# removed /etc indirection and package database check for office install location
Diffstat (limited to 'sysui')
| -rw-r--r-- | sysui/desktop/share/create_tree.sh | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/sysui/desktop/share/create_tree.sh b/sysui/desktop/share/create_tree.sh index 00b8cfaa2d4f..c2a92b9c1be1 100644 --- a/sysui/desktop/share/create_tree.sh +++ b/sysui/desktop/share/create_tree.sh @@ -92,11 +92,7 @@ fi mkdir -p ${DESTDIR}/usr/bin -# reference symbolic link in /etc for relocatable packages -office_root=/etc/${PREFIX} -if [ ! -e "${DESTDIR}/$office_root" -a ! -h "${DESTDIR}/$office_root" ]; then - office_root=/opt/${PREFIX} -fi +office_root=/opt/${PREFIX} ln -sf ${office_root}/program/soffice ${DESTDIR}/usr/bin/soffice ln -sf ${office_root}/program/unopkg ${DESTDIR}/usr/bin/unopkg |