From 81b530e55aaf17fdc84ba6b519491aa6b5c61878 Mon Sep 17 00:00:00 2001 From: Martin Blapp Date: Fri, 28 Dec 2001 10:36:58 +0000 Subject: Hardcode another /cdrom, since the define is not overwritten by the PRE section. Install the patches too for a WITH_CDROM installation. Approved by: demon --- french/staroffice52/Makefile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'french/staroffice52') diff --git a/french/staroffice52/Makefile b/french/staroffice52/Makefile index f97f51d24e09..5f72927a9ab7 100644 --- a/french/staroffice52/Makefile +++ b/french/staroffice52/Makefile @@ -94,7 +94,7 @@ pre-fetch: @${ECHO} .endif .if defined(WITH_CDROM) -.if !exists(${CD_MOUNTPT}/linux/office52/setup) +.if !exists(/cdrom/linux/office52/setup) @${ECHO} @${ECHO} "Montez le CDrom de Staroffice 5.2 dans le répertoire" @${ECHO} "${CD_MOUNTPT} et relancez l\'installation" @@ -172,13 +172,11 @@ do-install: ${ECHO} ; \ ${FALSE} ; \ fi -.if ! defined(WITH_CDROM) @${ECHO_MSG} "===> Application des correctifs sunsolve pour ${PKGNAME}" @for file in ${SUNSOLVE}/* ; do \ ${CP} -Rv $$file ${PREFIX}/office52/ ; \ done .endif -.endif post-install: @${PATCH} -s ${PREFIX}/office52/program/setup ${FILESDIR}/setup.patch -- cgit v1.2.3