'echo' behaviour differs between SYSV and BSD.

2 files changed, 8 insertions, 4 deletions

diff --git a/cddl/contrib/opensolaris/lib/libdtrace/common/mkerrtags.sh b/cddl/contrib/opensolaris/lib/libdtrace/common/mkerrtags.sh
index 67a696f..d5651ff 100644
--- a/cddl/contrib/opensolaris/lib/libdtrace/common/mkerrtags.sh
+++ b/cddl/contrib/opensolaris/lib/libdtrace/common/mkerrtags.sh
@@ -26,7 +26,9 @@
 #
 #ident	"%Z%%M%	%I%	%E% SMI"
 
-echo "\
+BSDECHO=-e
+
+echo ${BSDECHO} "\
 /*\n\
  * Copyright 2003 Sun Microsystems, Inc.  All rights reserved.\n\
  * Use is subject to license terms.\n\
@@ -43,7 +45,7 @@ replace='	"\1",'
 
 sed -n "s/$pattern/$replace/p" || exit 1
 
-echo "\
+echo ${BSDECHO} "\
 };\n\
 \n\
 static const int _dt_ntag = sizeof (_dt_errtags) / sizeof (_dt_errtags[0]);\n\
diff --git a/cddl/contrib/opensolaris/lib/libdtrace/common/mknames.sh b/cddl/contrib/opensolaris/lib/libdtrace/common/mknames.sh
index 7f90b7d..2fdc2fa 100644
--- a/cddl/contrib/opensolaris/lib/libdtrace/common/mknames.sh
+++ b/cddl/contrib/opensolaris/lib/libdtrace/common/mknames.sh
@@ -26,7 +26,9 @@
 #
 #ident	"%Z%%M%	%I%	%E% SMI"
 
-echo "\
+BSDECHO=-e
+
+echo ${BSDECHO} "\
 /*\n\
  * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.\n\
  * Use is subject to license terms.\n\
@@ -47,7 +49,7 @@ nawk '
 	printf("\tcase %s: return (\"%s\");\n", $2, tolower(substr($2, 10)));
 }'
 
-echo "\
+echo ${BSDECHO} "\
 	default: return (\"unknown\");\n\
 	}\n\
 }"