diff options
| author | jhb <jhb@FreeBSD.org> | 2001-03-02 08:27:40 +0800 |
|---|---|---|
| committer | jhb <jhb@FreeBSD.org> | 2001-03-02 08:27:40 +0800 |
| commit | e56bde34481a4a1484c99e48c4cd7a43d1b9061c (patch) | |
| tree | 529a96448f6b708d7113bf26316c10f19dc42272 | |
| parent | 3bc8bcb49fc0f76d6c3cf839592002fe52ec8f66 (diff) | |
| download | freebsd-ports-gnome-e56bde34481a4a1484c99e48c4cd7a43d1b9061c.tar.gz freebsd-ports-gnome-e56bde34481a4a1484c99e48c4cd7a43d1b9061c.tar.zst freebsd-ports-gnome-e56bde34481a4a1484c99e48c4cd7a43d1b9061c.zip | |
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>
| -rw-r--r-- | editors/staroffice52/Makefile | 2 | ||||
| -rw-r--r-- | editors/staroffice60/Makefile | 2 | ||||
| -rw-r--r-- | editors/staroffice70/Makefile | 2 | ||||
| -rw-r--r-- | french/staroffice52/Makefile | 2 | ||||
| -rw-r--r-- | german/staroffice52/Makefile | 2 | ||||
| -rw-r--r-- | german/staroffice70/Makefile | 2 |
6 files changed, 6 insertions, 6 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 ; \ diff --git a/french/staroffice52/Makefile b/french/staroffice52/Makefile index 0fbbe4b4746b..034e6434d72b 100644 --- a/french/staroffice52/Makefile +++ b/french/staroffice52/Makefile @@ -115,7 +115,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} Ignorez le message d\'erreur. StarOffice5.2 a correctement ; \ diff --git a/german/staroffice52/Makefile b/german/staroffice52/Makefile index a2a8a342d64d..88308b990768 100644 --- a/german/staroffice52/Makefile +++ b/german/staroffice52/Makefile @@ -114,7 +114,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} Ignorieren Sie die Fehlermeldung. StarOffice5.2 wurde erfolgreich ; \ diff --git a/german/staroffice70/Makefile b/german/staroffice70/Makefile index 9d49136f1c51..9106d0128fa7 100644 --- a/german/staroffice70/Makefile +++ b/german/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 ; \ |