- djm@cvs.openbsd.org 2010/01/30 02:54:53

[openssh.git] / survey.sh.in

diff --git a/survey.sh.in b/survey.sh.in
index 6a0c08df4a840fcad58c6c2586e62242986d39af..d6075a6b3d70915bb53a7121eec77d08f00e73f2 100644 (file)
--- a/survey.sh.in
+++ b/survey.sh.in
@@ -45,6 +45,8 @@ echo "uname-p: `uname -p`"
 echo
 echo "oslevel: `oslevel 2>/dev/null`"
 echo
+echo "oslevel-r: `oslevel -r 2>/dev/null`"
+echo
 echo "cc: $CC"
 echo
 echo "cflags: $CFLAGS"
@@ -55,9 +57,9 @@ echo "ldflags: $LDFLAGS"
 echo
 echo "libs: $LIBS"
 echo
-echo "ccver-v: `$CC -v 2>&1`"
+echo "ccver-v: `$CC -v 2>&1 | sed '/^[ \t]*$/d'`"
 echo
-echo "ccver-V: `$CC -V 2>&1`"
+echo "ccver-V: `$CC -V 2>&1 | sed '/^[ \t]*$/d'`"
 echo
 echo "cppdefines:"
 ${CPP} -dM - </dev/null