summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Meyering <meyering@redhat.com>2008-04-22 10:52:37 +0200
committerJim Meyering <meyering@redhat.com>2008-04-22 10:52:37 +0200
commit0bc8813b1e40435ced17c555149e26c5aadbdda6 (patch)
tree0751ed9bc7a60c146e1a2ddf4ed117c4304050c1
parent68466d44b1ff35383271930c12186b3d2fd53976 (diff)
downloadcoreutils-0bc8813b1e40435ced17c555149e26c5aadbdda6.tar.xz
Accommodate building on OS/2 (www.ecomstation.com Ecs v2 rc4)
* configure.ac: Filter out carriage returns in more places. Reported by Elbert Pol, details here: http://thread.gmane.org/gmane.org.fsf.announce/867/focus=13332
-rw-r--r--configure.ac7
1 files changed, 4 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index 4cd0d7c84..adf290363 100644
--- a/configure.ac
+++ b/configure.ac
@@ -259,7 +259,7 @@ mk="$srcdir/src/Makefile.am"
v=EXTRA_PROGRAMS
for gl_i in `sed -n '/^'$v' =/,/[[^\]]$/p' $mk \
| sed 's/^ *//;/^\$.*/d;/^'$v' =/d' \
- | tr -s '\\012\\\\' ' '`; do
+ | tr -s '\\015\\012\\\\' ' '`; do
gl_ADD_PROG([optional_bin_progs], $gl_i)
done
@@ -310,10 +310,11 @@ case " $optional_bin_progs " in
*) INSTALL_SU=no ;;
esac
-MAN=`echo "$optional_bin_progs "|sed 's/ /.1 /g;s/ $//'`
+MAN=`echo "$optional_bin_progs "|sed 's/ /.1 /g;s/ $//'|tr -d '\\015\\012'`
# Change ginstall.1 to "install.h" in $MAN.
-MAN=`for m in $MAN; do test $m = ginstall.1 && m=install.1; echo $m; done | tr '\012' ' '; echo`
+MAN=`for m in $MAN; do test $m = ginstall.1 && m=install.1; echo $m; done \
+ | tr '\015\012' ' '; echo`
# Remove [.1, since writing a portable rule for it in man/Makefile.am
# is not practical. The sed LHS below uses the autoconf quadrigraph