diff options
| author | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2003-01-22 02:14:26 +0000 |
|---|---|---|
| committer | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2003-01-22 02:14:26 +0000 |
| commit | b6f02b7475322d44294453b204a8dadf37014934 (patch) | |
| tree | 93c922ba1f6188ddf2db1c824123f94ec5423be8 /aclocal-flags | |
| parent | 70a92ad0a829ab13ae146fb026178ff16539c62d (diff) | |
"echo -n" isn't portable, and neither is sticking "\c" at the end of the
string to be echoed; use "tr" to delete new lines and, while we're at
it, also delete carriage returns (just in case this is being run under
Cygwin or something such as that, and it produces lines ending with
CR-LF). Don't use character classes - I seem to remember that some
versions of "tr" require you to put the classes in square brackets and
some other versions don't work if you put them in square brackets.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6973 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'aclocal-flags')
| -rwxr-xr-x | aclocal-flags | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/aclocal-flags b/aclocal-flags index fdf750da8f..5d5f52503e 100755 --- a/aclocal-flags +++ b/aclocal-flags @@ -21,7 +21,7 @@ # "aclocal" will look in that directory twice, and get well and truly # confused, reporting a ton of duplicate macro definitions.) # -# $Id: aclocal-flags,v 1.5 2003/01/22 00:19:00 jmayer Exp $ +# $Id: aclocal-flags,v 1.6 2003/01/22 02:14:26 guy Exp $ # # @@ -42,7 +42,7 @@ else fi ac_missing_dir=`dirname $0` -echo -n "-I $ac_missing_dir/aclocal-missing" +echo "-I $ac_missing_dir/aclocal-missing" | tr -d '\012' | tr -d '\015' # # If there's no "aclocal", the former will be empty; if there's no @@ -54,7 +54,7 @@ echo -n "-I $ac_missing_dir/aclocal-missing" if [ ! -z "$aclocal_dir" -a ! -z "$gtk_aclocal_dir" \ -a "$aclocal_dir" != "$gtk_aclocal_dir" ] then - echo -n " $gtk_aclocal_dir" + echo " $gtk_aclocal_dir" | tr -d '\012' | tr -d '\015' fi echo exit 0 |