6117 Many small bugs prevent a clean build on SPARC

@@ -22,10 +22,11 @@
 #
 # Copyright (c) 1989, 2010, Oracle and/or its affiliates. All rights reserved.
 # Copyright (c) 2012 by Delphix. All rights reserved.
 # Copyright 2014 Garrett D'Amore <garrett@damore.org>
 # Copyright 2015, OmniTI Computer Consulting, Inc. All rights reserved.
+# Copyright 2015 Gary Mills
 #
 
 #
 # Makefile.master, global definitions for system source
 #

@@ -147,11 +148,11 @@
 NAWK=           /usr/bin/nawk
 CP=             /usr/bin/cp -f
 MCS=            /usr/ccs/bin/mcs
 CAT=            /usr/bin/cat
 ELFDUMP=        /usr/ccs/bin/elfdump
-M4=             /usr/ccs/bin/m4
+M4=             /usr/bin/m4
 STRIP=          /usr/ccs/bin/strip
 LEX=            /usr/ccs/bin/lex
 FLEX=           /usr/bin/flex
 YACC=           /usr/ccs/bin/yacc
 CPP=            /usr/lib/cpp