diff options
| author | John Baldwin <jhb@FreeBSD.org> | 2001-03-02 00:27:40 +0000 |
|---|---|---|
| committer | John Baldwin <jhb@FreeBSD.org> | 2001-03-02 00:27:40 +0000 |
| commit | a849609e9377bbf53f4c4d74b72a5808de51faa0 (patch) | |
| tree | 752572c04e5fd06bce2bfbe37fbf3b13e1fd1232 /editors | |
| parent | Update 0.96 -> 0.96.1 (diff) | |
Ensure that /bin is at the head of the path when running the setup program
so that we get the right uname binary.
PR: 24049, 25231, 25443, 25458
Submitted by: Martin Blapp <mb@imp.ch>
Notes
Notes:
svn path=/head/; revision=38946
Diffstat (limited to 'editors')
| -rw-r--r-- | editors/staroffice52/Makefile | 2 | ||||
| -rw-r--r-- | editors/staroffice60/Makefile | 2 | ||||
| -rw-r--r-- | editors/staroffice70/Makefile | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/editors/staroffice52/Makefile b/editors/staroffice52/Makefile index 9d49136f1c51..9106d0128fa7 100644 --- a/editors/staroffice52/Makefile +++ b/editors/staroffice52/Makefile @@ -120,7 +120,7 @@ do-install: @ ${LN} -fs ${LINUXBASE}/${PREFIX}/office52 ${PREFIX}/office52 .endif @${CAT} ${PKGMESSAGE} - @-SAL_IGNOREXERRORS=1 TEMP=${TMPDIR} LD_LIBRARY_PATH=${LD_PATH} ${LINUXBASE}/bin/sh -c '${WRKSRC}/setup /net' + @-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" TEMP=${TMPDIR} LD_LIBRARY_PATH=${LD_PATH} ${LINUXBASE}/bin/sh -c '${WRKSRC}/setup /net' @if [ -f ${PREFIX}/office52/program/setup ]; then \ ${ECHO} ; \ ${ECHO} Ignore the error-message. StarOffice5.2 has been installed ; \ diff --git a/editors/staroffice60/Makefile b/editors/staroffice60/Makefile index 9d49136f1c51..9106d0128fa7 100644 --- a/editors/staroffice60/Makefile +++ b/editors/staroffice60/Makefile @@ -120,7 +120,7 @@ do-install: @ ${LN} -fs ${LINUXBASE}/${PREFIX}/office52 ${PREFIX}/office52 .endif @${CAT} ${PKGMESSAGE} - @-SAL_IGNOREXERRORS=1 TEMP=${TMPDIR} LD_LIBRARY_PATH=${LD_PATH} ${LINUXBASE}/bin/sh -c '${WRKSRC}/setup /net' + @-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" TEMP=${TMPDIR} LD_LIBRARY_PATH=${LD_PATH} ${LINUXBASE}/bin/sh -c '${WRKSRC}/setup /net' @if [ -f ${PREFIX}/office52/program/setup ]; then \ ${ECHO} ; \ ${ECHO} Ignore the error-message. StarOffice5.2 has been installed ; \ diff --git a/editors/staroffice70/Makefile b/editors/staroffice70/Makefile index 9d49136f1c51..9106d0128fa7 100644 --- a/editors/staroffice70/Makefile +++ b/editors/staroffice70/Makefile @@ -120,7 +120,7 @@ do-install: @ ${LN} -fs ${LINUXBASE}/${PREFIX}/office52 ${PREFIX}/office52 .endif @${CAT} ${PKGMESSAGE} - @-SAL_IGNOREXERRORS=1 TEMP=${TMPDIR} LD_LIBRARY_PATH=${LD_PATH} ${LINUXBASE}/bin/sh -c '${WRKSRC}/setup /net' + @-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" TEMP=${TMPDIR} LD_LIBRARY_PATH=${LD_PATH} ${LINUXBASE}/bin/sh -c '${WRKSRC}/setup /net' @if [ -f ${PREFIX}/office52/program/setup ]; then \ ${ECHO} ; \ ${ECHO} Ignore the error-message. StarOffice5.2 has been installed ; \ |