summaryrefslogtreecommitdiff
path: root/editors
diff options
context:
space:
mode:
authorDavid E. O'Brien <obrien@FreeBSD.org>2000-10-14 20:10:11 +0000
committerDavid E. O'Brien <obrien@FreeBSD.org>2000-10-14 20:10:11 +0000
commit8c0ea44471767470db5f34efb5e0ca7887118078 (patch)
tree785d29a05534e7cadfc0a8fa812d602a141549fe /editors
parentFix Imakefile breakage under XFree86 4.x (diff)
Fix CDROM based installs.
Approved by: Martin Blapp <mb@imp.ch>
Notes
Notes: svn path=/head/; revision=33839
Diffstat (limited to 'editors')
-rw-r--r--editors/staroffice52/Makefile9
-rw-r--r--editors/staroffice60/Makefile9
-rw-r--r--editors/staroffice70/Makefile9
3 files changed, 15 insertions, 12 deletions
diff --git a/editors/staroffice52/Makefile b/editors/staroffice52/Makefile
index d510844e3a06..4085d13df594 100644
--- a/editors/staroffice52/Makefile
+++ b/editors/staroffice52/Makefile
@@ -56,16 +56,17 @@ pre-fetch:
.if !exists(${CD_MOUNTPT}/linux/office52/setup)
@${ECHO}
@${ECHO} Please mount the Sun StarOffice 5.2 CDROM
- @${ECHO} onto /cdrom and run make again.
+ @${ECHO} onto ${CD_MOUNTPT} and run make again.
@${ECHO}
@${FALSE}
.endif
.endif
.if defined(WITH_CDROM)
-do-extract:
- @${MKDIR} ${WRKSRC}/office52
- @cd ${WRKSRC}/office52 && ${LN} -s ${CD_MOUNTPT}/linux/office52/* .
+do-extract: do-extract-cdrom
+do-extract-cdrom:
+ @${MKDIR} ${WRKSRC}
+ @cd ${WRKSRC} && ${LN} -s ${CD_MOUNTPT}/linux/office52/* .
.endif
do-extract:
diff --git a/editors/staroffice60/Makefile b/editors/staroffice60/Makefile
index d510844e3a06..4085d13df594 100644
--- a/editors/staroffice60/Makefile
+++ b/editors/staroffice60/Makefile
@@ -56,16 +56,17 @@ pre-fetch:
.if !exists(${CD_MOUNTPT}/linux/office52/setup)
@${ECHO}
@${ECHO} Please mount the Sun StarOffice 5.2 CDROM
- @${ECHO} onto /cdrom and run make again.
+ @${ECHO} onto ${CD_MOUNTPT} and run make again.
@${ECHO}
@${FALSE}
.endif
.endif
.if defined(WITH_CDROM)
-do-extract:
- @${MKDIR} ${WRKSRC}/office52
- @cd ${WRKSRC}/office52 && ${LN} -s ${CD_MOUNTPT}/linux/office52/* .
+do-extract: do-extract-cdrom
+do-extract-cdrom:
+ @${MKDIR} ${WRKSRC}
+ @cd ${WRKSRC} && ${LN} -s ${CD_MOUNTPT}/linux/office52/* .
.endif
do-extract:
diff --git a/editors/staroffice70/Makefile b/editors/staroffice70/Makefile
index d510844e3a06..4085d13df594 100644
--- a/editors/staroffice70/Makefile
+++ b/editors/staroffice70/Makefile
@@ -56,16 +56,17 @@ pre-fetch:
.if !exists(${CD_MOUNTPT}/linux/office52/setup)
@${ECHO}
@${ECHO} Please mount the Sun StarOffice 5.2 CDROM
- @${ECHO} onto /cdrom and run make again.
+ @${ECHO} onto ${CD_MOUNTPT} and run make again.
@${ECHO}
@${FALSE}
.endif
.endif
.if defined(WITH_CDROM)
-do-extract:
- @${MKDIR} ${WRKSRC}/office52
- @cd ${WRKSRC}/office52 && ${LN} -s ${CD_MOUNTPT}/linux/office52/* .
+do-extract: do-extract-cdrom
+do-extract-cdrom:
+ @${MKDIR} ${WRKSRC}
+ @cd ${WRKSRC} && ${LN} -s ${CD_MOUNTPT}/linux/office52/* .
.endif
do-extract: