From e1eccd45658e98553dd17fe494176e363aac295a Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Thu, 29 Aug 2024 11:15:33 +0100 Subject: [PATCH] Attempt (2) egrep compat for Solaris vs. Linux --- src/scripts/Configure-Makefile | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/src/scripts/Configure-Makefile b/src/scripts/Configure-Makefile index 2b8a9bcb5..c3019f846 100755 --- a/src/scripts/Configure-Makefile +++ b/src/scripts/Configure-Makefile @@ -29,16 +29,6 @@ fi archtype=`../scripts/arch-type` || exit 1 -# Linux now whines about egrep, saying "use grep -E". -# Solarix doesn't support -E on grep. Thanks so much for -# going non-back-compatible, Linux. -if echo 1 | grep -E 1 >/dev/null; then - egrep="grep -E" -else - egrep="egrep" -fi - - # Now test for either the non-existence of Makefile, or for any of its # components being newer. Note that the "newer" script gives the right # answer (for our purposes) when the first file is non-existent. @@ -76,7 +66,7 @@ fi # Linux now whines about egrep, saying "use grep -E". # Solarix doesn't support -E on grep. Thanks so much for # going non-back-compatible, Linux. -if echo 1 | grep -E 1 >/dev/null; then +if [ "$ostype" != "SunOS5" ] ; then egrep="grep -E" else egrep="egrep" -- 2.30.2