diff options
| author | Martin Blapp <mbr@FreeBSD.org> | 2001-12-28 10:36:58 +0000 |
|---|---|---|
| committer | Martin Blapp <mbr@FreeBSD.org> | 2001-12-28 10:36:58 +0000 |
| commit | 81b530e55aaf17fdc84ba6b519491aa6b5c61878 (patch) | |
| tree | fe35f08b846ab5c9e87a6ba3434466cbc7e3995a | |
| parent | - Extend patch to fix last db3 update (diff) | |
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
Notes
Notes:
svn path=/head/; revision=52321
| -rw-r--r-- | editors/staroffice52/Makefile | 4 | ||||
| -rw-r--r-- | french/staroffice52/Makefile | 4 | ||||
| -rw-r--r-- | german/staroffice52/Makefile | 4 |
3 files changed, 3 insertions, 9 deletions
diff --git a/editors/staroffice52/Makefile b/editors/staroffice52/Makefile index ad433b7b045a..811ee210b414 100644 --- a/editors/staroffice52/Makefile +++ b/editors/staroffice52/Makefile @@ -93,7 +93,7 @@ pre-fetch: @ ${ECHO} .endif .if defined(WITH_CDROM) -.if !exists(${CD_MOUNTPT}/linux/office52/setup) +.if !exists(/cdrom/linux/office52/setup) @${ECHO} @${ECHO} Please mount the Sun StarOffice 5.2 CDROM @${ECHO} onto ${CD_MOUNTPT} and run make again. @@ -171,13 +171,11 @@ do-install: ${ECHO} ; \ ${FALSE} ; \ fi -.if ! defined(WITH_CDROM) @${ECHO_MSG} "===> Applying sunsolve patches for ${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 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 diff --git a/german/staroffice52/Makefile b/german/staroffice52/Makefile index 61baa96b83aa..2a2a6b5a79c9 100644 --- a/german/staroffice52/Makefile +++ b/german/staroffice52/Makefile @@ -91,7 +91,7 @@ pre-fetch: @ ${ECHO} .endif .if defined(WITH_CDROM) -.if !exists(${CD_MOUNTPT}/linux/office52/setup) +.if !exists(/cdrom/linux/office52/setup) @${ECHO} @${ECHO} Bitte mounten Sie die Sun StarOffice 5.2 CDROM @${ECHO} nach ${CD_MOUNTPT} and starten Sie make erneut. @@ -171,13 +171,11 @@ do-install: ${ECHO} ; \ ${FALSE} ; \ fi -.if ! defined(WITH_CDROM) @${ECHO_MSG} "===> Applying sunsolve patches for ${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 |