Skip to content

Commit

Permalink
may apply to other Linux distros
Browse files Browse the repository at this point in the history
git-svn-id: https://svn.r-project.org/R/trunk@84962 00db46b3-68df-0310-9c12-caf00c1e9a41
  • Loading branch information
ripley committed Aug 16, 2023
1 parent a03078f commit 4780407
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 3 deletions.
6 changes: 4 additions & 2 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -5390,6 +5390,8 @@ fi
done
test -n "$SED" || SED="/bin/sed"

${SED} --version | grep "GNU sed" && set SED="$SED --posix"

## 'which' is not POSIX, and might be a shell builtin or alias
## (but should not be in 'sh')
for ac_prog in which
Expand Down Expand Up @@ -27114,7 +27116,7 @@ _ACEOF
# flags.
r_save_CFLAGS=$CFLAGS
CFLAGS="$CFLAGS $r_verb"
(eval echo $as_me:27119: \"$ac_link\") >&5
(eval echo $as_me:27121: \"$ac_link\") >&5
r_c_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
echo "$r_c_v_output" >&5
CFLAGS=$r_save_CFLAGS
Expand Down Expand Up @@ -27190,7 +27192,7 @@ _ACEOF
# flags.
r_save_CFLAGS=$CFLAGS
CFLAGS="$CFLAGS $r_cv_prog_c_v"
(eval echo $as_me:27195: \"$ac_link\") >&5
(eval echo $as_me:27197: \"$ac_link\") >&5
r_c_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
echo "$r_c_v_output" >&5
CFLAGS=$r_save_CFLAGS
Expand Down
1 change: 1 addition & 0 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -680,6 +680,7 @@ R_PROG_INSTALL

## we would like a POSIX sed, and need one on Solaris
AC_PATH_PROGS(SED, sed, /bin/sed, [/usr/xpg4/bin:$PATH])

## 'which' is not POSIX, and might be a shell builtin or alias
## (but should not be in 'sh')
AC_PATH_PROGS(WHICH, which, which)
Expand Down
2 changes: 1 addition & 1 deletion src/library/base/man/Rhome.Rd
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ R.home(component = "home")

The paths to components often are subdirectories of \var{R_HOME} but
need not be: \code{"doc"}, \code{"include"} and \code{"share"} are
not for a binary Debian/Ubuntu installation of \R.
not for some Linux binary installations of \R.
}
\value{
A character string giving the \R home directory or path to a
Expand Down

0 comments on commit 4780407

Please sign in to comment.