6383 update AWK to use /usr/bin/nawk and update $(AWK) where it's possible

Reviewed by: Toomas Soome <tsoome@me.com>
Reviewed by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
Reviewed by: Albert Lee <trisk@omniti.com>
Approved by: Robert Mustacchi <rm@joyent.com>

29 files changed, 73 insertions, 53 deletions

diff --git a/usr/src/Makefile.master b/usr/src/Makefile.master
index 6a0fb4868c..95e5b5faec 100644
--- a/usr/src/Makefile.master
+++ b/usr/src/Makefile.master
@@ -146,8 +146,7 @@ EGREP=		/usr/bin/egrep
 ELFWRAP=	/usr/bin/elfwrap
 KSH93=		/usr/bin/ksh93
 SED=		/usr/bin/sed
-NAWK=		/usr/bin/nawk
-AWK=		/usr/bin/awk
+AWK=		/usr/bin/nawk
 CP=		/usr/bin/cp -f
 MCS=		/usr/ccs/bin/mcs
 CAT=            /usr/bin/cat
diff --git a/usr/src/Makefile.msg.targ b/usr/src/Makefile.msg.targ
index 1075e5025c..71fac7a34d 100644
--- a/usr/src/Makefile.msg.targ
+++ b/usr/src/Makefile.msg.targ
@@ -21,6 +21,7 @@
 #
 # Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
+# Copyright 2015 Igor Kozhukhov <ikozhukhov@gmail.com>
 #
 # Makefile.msg.targ
 #
@@ -53,7 +54,7 @@ BUILDPO.msgfiles = \
 
 BUILDPO.pofiles = \
 	$(RM) $(POFILE); \
-	$(NAWK) '\
+	$(AWK) '\
 	    FNR == 1		{ print "\# Messages from " FILENAME; } \
 	    /^domain/		{ next; } \
 	    /^msgid/, /^msgstr/	{ msg = msg "\n" $$0; \
diff --git a/usr/src/cmd/lp/filter/postscript/dpost/Makefile b/usr/src/cmd/lp/filter/postscript/dpost/Makefile
index bb081538d4..73c096c811 100644
--- a/usr/src/cmd/lp/filter/postscript/dpost/Makefile
+++ b/usr/src/cmd/lp/filter/postscript/dpost/Makefile
@@ -20,10 +20,9 @@
 # CDDL HEADER END
 #
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 # Copyright 1989-2002 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
+# Copyright 2015 Igor Kozhukhov <ikozhukhov@gmail.com>
 #
 # cmd/lp/filter/postscript/dpost/Makefile
 #
@@ -70,7 +69,7 @@ $(COMMONOBJS):	$$(@:%.o=%.c)
 
 ps_include.o:	ps_include.h
 ps_include.h:	ps_include.ps ps_include.awk
-		$(RM) $@; awk -f ps_include.awk ps_include.ps >$@
+		$(RM) $@; $(AWK) -f ps_include.awk ps_include.ps >$@
 
 clean:
 		$(RM) $(OBJS) ps_include.h
diff --git a/usr/src/cmd/lvm/rpc.metamhd/i386/Makefile b/usr/src/cmd/lvm/rpc.metamhd/i386/Makefile
index 856ec7d49e..1eec312179 100644
--- a/usr/src/cmd/lvm/rpc.metamhd/i386/Makefile
+++ b/usr/src/cmd/lvm/rpc.metamhd/i386/Makefile
@@ -22,6 +22,7 @@
 #
 # Copyright 1996, 2001-2003 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
+# Copyright 2015 Igor Kozhukhov <ikozhukhov@gmail.com>
 #
 #
 # Makefile for logical volume management 
@@ -124,4 +125,4 @@ metamhd_xdr.c: $(SRC)/head/metamhd.x
 
 mhdx_xdr.c: $(SRC)/uts/common/sys/lvm/mhdx.x
 	$(RPCGEN) $(RPCGENFLAGS) -c $(SRC)/uts/common/sys/lvm/mhdx.x | \
-	nawk '{sub(/uts\/common\/sys\/lvm/, "head") ; print $$0}' >$@
+	$(AWK) '{sub(/uts\/common\/sys\/lvm/, "head") ; print $$0}' >$@
diff --git a/usr/src/cmd/lvm/rpc.metamhd/sparc/Makefile b/usr/src/cmd/lvm/rpc.metamhd/sparc/Makefile
index 856ec7d49e..1eec312179 100644
--- a/usr/src/cmd/lvm/rpc.metamhd/sparc/Makefile
+++ b/usr/src/cmd/lvm/rpc.metamhd/sparc/Makefile
@@ -22,6 +22,7 @@
 #
 # Copyright 1996, 2001-2003 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
+# Copyright 2015 Igor Kozhukhov <ikozhukhov@gmail.com>
 #
 #
 # Makefile for logical volume management 
@@ -124,4 +125,4 @@ metamhd_xdr.c: $(SRC)/head/metamhd.x
 
 mhdx_xdr.c: $(SRC)/uts/common/sys/lvm/mhdx.x
 	$(RPCGEN) $(RPCGENFLAGS) -c $(SRC)/uts/common/sys/lvm/mhdx.x | \
-	nawk '{sub(/uts\/common\/sys\/lvm/, "head") ; print $$0}' >$@
+	$(AWK) '{sub(/uts\/common\/sys\/lvm/, "head") ; print $$0}' >$@
diff --git a/usr/src/cmd/sgs/packages/Makefile.targ b/usr/src/cmd/sgs/packages/Makefile.targ
index 27f0ce4ea1..a4b307f359 100644
--- a/usr/src/cmd/sgs/packages/Makefile.targ
+++ b/usr/src/cmd/sgs/packages/Makefile.targ
@@ -20,9 +20,11 @@
 #
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
+# Copyright 2015 Igor Kozhukhov <ikozhukhov@gmail.com>
+#
 
 pkginfo: ../common/pkginfo.tmpl awk_pkginfo
-	$(RM) $@; nawk -f awk_pkginfo ../common/$@.tmpl > $@
+	$(RM) $@; $(AWK) -f awk_pkginfo ../common/$@.tmpl > $@
 
 pkg: FRC
 	@ $(RM) -r $(PACKAGE)
diff --git a/usr/src/common/mapfiles/gen/Makefile b/usr/src/common/mapfiles/gen/Makefile
index f1496fcea9..6990ae59f9 100644
--- a/usr/src/common/mapfiles/gen/Makefile
+++ b/usr/src/common/mapfiles/gen/Makefile
@@ -22,8 +22,7 @@
 #
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
-#
-# ident	"%Z%%M%	%I%	%E% SMI"
+# Copyright 2015 Igor Kozhukhov <ikozhukhov@gmail.com>
 #
 
 include		$(SRC)/Makefile.master
@@ -98,10 +97,10 @@ $(MACH64)_gcc_map.noexeglobs :=	LINK =	$(LINK64.c)
 %map.noexeglobs:main.c $(TEMPLATE1) $(TEMPLATE2)
 	$(LINK) -o $(MAIN1) -M$(TEMPLATE1) main.c
 	$(ELFDUMP) -s -N.dynsym $(MAIN1) | $(EGREP) "WEAK|GLOB" | \
-	    $(GREP) -v UNDEF | $(NAWK) '{print $$9 }' | $(SORT) > $(SYMS1)
+	    $(GREP) -v UNDEF | $(AWK) '{print $$9 }' | $(SORT) > $(SYMS1)
 	$(LINK) -o $(MAIN2) -M$(TEMPLATE2) main.c
 	$(ELFDUMP) -s -N.dynsym $(MAIN2) | $(EGREP) "WEAK|GLOB" | \
-	    $(GREP) -v UNDEF | $(NAWK) '{print $$9 }' | $(SORT) > $(SYMS2)
+	    $(GREP) -v UNDEF | $(AWK) '{print $$9 }' | $(SORT) > $(SYMS2)
 	$(ECHO) "# GENERATED FILE - DO NOT EDIT"	>  $@
 	$(GREP) MAP-HEAD $(TEMPLATE2) | \
 	    $(SED) -e "s/	*# MAP-HEAD//"		>> $@
diff --git a/usr/src/head/Makefile b/usr/src/head/Makefile
index b9b290c59b..61e63fed38 100644
--- a/usr/src/head/Makefile
+++ b/usr/src/head/Makefile
@@ -475,8 +475,8 @@ mhdx.h:	../uts/common/sys/lvm/mhdx.x
 
 mdiox.h:	../uts/common/sys/lvm/mdiox.x
 	$(RPCGEN) $(RPCGENFLAGS) ../uts/common/sys/lvm/mdiox.x | \
-	$(NAWK) '{sub(/sys\/lvm\/md_mhdx/, "mhdx"); print $$0}' | \
-	$(NAWK) '{sub(/sys\/lvm\/md_basic/, "meta_basic"); print $$0}' | \
+	$(AWK) '{sub(/sys\/lvm\/md_mhdx/, "mhdx"); print $$0}' | \
+	$(AWK) '{sub(/sys\/lvm\/md_basic/, "meta_basic"); print $$0}' | \
 	$(AWK) '/<synch.h>/ { print "#ifdef _REENTRANT"; print $$0; print "#endif\t/* _REENTRANT */"; next } \
 	/<thread.h>/ { print "#ifdef _REENTRANT"; print $$0; print "#endif\t/* _REENTRANT */"; next } \
 	{ print $0 } \
@@ -484,7 +484,7 @@ mdiox.h:	../uts/common/sys/lvm/mdiox.x
 
 metamed.h:	../uts/common/sys/lvm/metamed.x
 	$(RPCGEN) $(RPCGENFLAGS) ../uts/common/sys/lvm/metamed.x | \
-	$(NAWK) '{sub(/sys\/lvm\/md_basic/, "meta_basic"); print $$0}' | \
+	$(AWK) '{sub(/sys\/lvm\/md_basic/, "meta_basic"); print $$0}' | \
 	$(AWK) '/<synch.h>/ { print "#ifdef _REENTRANT"; print $$0; print "#endif\t/* _REENTRANT */"; next } \
 	/<thread.h>/ { print "#ifdef _REENTRANT"; print $$0; print "#endif\t/* _REENTRANT */"; next } \
 	{ print $0 } \
diff --git a/usr/src/lib/Makefile.lib b/usr/src/lib/Makefile.lib
index 5574164fb5..d891e418a7 100644
--- a/usr/src/lib/Makefile.lib
+++ b/usr/src/lib/Makefile.lib
@@ -19,6 +19,7 @@
 # CDDL HEADER END
 #
 # Copyright 2015 Gary Mills
+# Copyright 2015 Igor Kozhukhov <ikozhukhov@gmail.com>
 # Copyright (c) 1989, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 #
@@ -31,7 +32,6 @@ include		$(SRC)/Makefile.master
 
 LORDER=		lorder
 TSORT=		tsort
-AWK=		awk
 
 #
 # By default, we define the source directory for libraries to be
diff --git a/usr/src/lib/libsmbfs/Makefile.com b/usr/src/lib/libsmbfs/Makefile.com
index f5801a18db..0721dfc302 100644
--- a/usr/src/lib/libsmbfs/Makefile.com
+++ b/usr/src/lib/libsmbfs/Makefile.com
@@ -22,6 +22,7 @@
 #
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
+# Copyright 2015 Igor Kozhukhov <ikozhukhov@gmail.com>
 #
 # Copyright 2013 Nexenta Systems, Inc.  All rights reserved.
 #
@@ -118,7 +119,7 @@ ${NOT_RELEASE_BUILD} CPPFLAGS += -DDEBUG
 
 # Filter out the less important lint.
 # See lgrep.awk
-LGREP =	nawk -f $(SRCDIR)/lgrep.awk
+LGREP =	$(AWK) -f $(SRCDIR)/lgrep.awk
 LTAIL	+=	2>&1 | $(LGREP)
 
 all:	$(LIBS)
diff --git a/usr/src/lib/libsqlite/Makefile.com b/usr/src/lib/libsqlite/Makefile.com
index e45f1767dc..b2712a24d6 100644
--- a/usr/src/lib/libsqlite/Makefile.com
+++ b/usr/src/lib/libsqlite/Makefile.com
@@ -1,6 +1,7 @@
 #
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
+# Copyright 2015 Igor Kozhukhov <ikozhukhov@gmail.com>
 #
 
 # Make the SO name unlikely to conflict with any other
@@ -219,7 +220,7 @@ opcodes.h: $(SRCDIR)/vdbe.c
 	 echo '/* Automatically generated file.  Do not edit */' > $@ ; \
 	 grep '^case OP_' $(SRCDIR)/vdbe.c | \
 	    sed -e 's/://' | \
-	    awk '{printf "#define %-30s %3d\n", $$2, ++cnt}' >> $@
+	    $(AWK) '{printf "#define %-30s %3d\n", $$2, ++cnt}' >> $@
 
 opcodes.c: $(SRCDIR)/vdbe.c
 	@echo "Generating $@"; \
diff --git a/usr/src/lib/libxcurses/Makefile b/usr/src/lib/libxcurses/Makefile
index 77941c6a69..f8a1e65861 100644
--- a/usr/src/lib/libxcurses/Makefile
+++ b/usr/src/lib/libxcurses/Makefile
@@ -21,6 +21,7 @@
 #
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
+# Copyright 2015 Igor Kozhukhov <ikozhukhov@gmail.com>
 #
 
 include	../Makefile.lib
@@ -75,13 +76,13 @@ $(SUBDIRS):	$(GENERATED)
 # mknames.awk defines functions so needs nawk
 $(NAMES) : src/libc/xcurses/mknames.awk src/libc/xcurses/caps
 	$(RM) $(NAMES)
-	cd src/libc/xcurses; $(NAWK) -f mknames.awk caps
+	cd src/libc/xcurses; $(AWK) -f mknames.awk caps
 
 h/term.h : src/libc/xcurses/mkterm.awk src/libc/xcurses/caps
 	$(RM) $@
-	cd src/libc/xcurses; $(NAWK) -f mkterm.awk caps > term.h
+	cd src/libc/xcurses; $(AWK) -f mkterm.awk caps > term.h
 	$(MV) src/libc/xcurses/term.h h/term.h
 
 src/libc/xcurses/keyindex.c : src/libc/xcurses/mkkey.awk src/libc/xcurses/caps
 	$(RM) $@
-	cd src/libc/xcurses; $(NAWK) -f mkkey.awk caps > keyindex.c
+	cd src/libc/xcurses; $(AWK) -f mkkey.awk caps > keyindex.c
diff --git a/usr/src/lib/libxcurses2/Makefile b/usr/src/lib/libxcurses2/Makefile
index c0a3e45bbb..d99a9628c8 100644
--- a/usr/src/lib/libxcurses2/Makefile
+++ b/usr/src/lib/libxcurses2/Makefile
@@ -21,6 +21,7 @@
 #
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
+# Copyright 2015 Igor Kozhukhov <ikozhukhov@gmail.com>
 #
 
 include	../Makefile.lib
@@ -83,13 +84,13 @@ $(SUBDIRS):	$(GENERATED)
 # mknames.awk defines functions so needs nawk
 $(NAMES) : src/libc/xcurses/mknames.awk src/libc/xcurses/caps
 	$(RM) $(NAMES)
-	cd src/libc/xcurses; $(NAWK) -f mknames.awk caps
+	cd src/libc/xcurses; $(AWK) -f mknames.awk caps
 
 h/term.h : src/libc/xcurses/mkterm.awk src/libc/xcurses/caps
 	$(RM) $@
-	cd src/libc/xcurses; $(NAWK) -f mkterm.awk caps > term.h
+	cd src/libc/xcurses; $(AWK) -f mkterm.awk caps > term.h
 	$(MV) src/libc/xcurses/term.h h/term.h
 
 src/libc/xcurses/keyindex.c : src/libc/xcurses/mkkey.awk src/libc/xcurses/caps
 	$(RM) $@
-	cd src/libc/xcurses; $(NAWK) -f mkkey.awk caps > keyindex.c
+	cd src/libc/xcurses; $(AWK) -f mkkey.awk caps > keyindex.c
diff --git a/usr/src/lib/lvm/libmeta/Makefile.com b/usr/src/lib/lvm/libmeta/Makefile.com
index d7cf185a64..66f42e178e 100644
--- a/usr/src/lib/lvm/libmeta/Makefile.com
+++ b/usr/src/lib/lvm/libmeta/Makefile.com
@@ -21,8 +21,7 @@
 #
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
-#
-# ident	"%Z%%M%	%I%	%E% SMI"
+# Copyright 2015 Igor Kozhukhov <ikozhukhov@gmail.com>
 #
 
 LIBRARY=       	libmeta.a 
@@ -160,11 +159,11 @@ objs/%.o profs/%.o pics/%.o: $(COMMON)/%.c
 
 mdiox_xdr.c: $(SRC)/uts/common/sys/lvm/mdiox.x
 	$(RPCGEN) $(RPCGENFLAGS) -c -i 100 $(SRC)/uts/common/sys/lvm/mdiox.x | \
-	nawk '{sub(/uts\/common\/sys\/lvm/, "head"); print $$0}' >$@
+	$(AWK) '{sub(/uts\/common\/sys\/lvm/, "head"); print $$0}' >$@
 
 meta_basic_xdr.c: $(SRC)/uts/common/sys/lvm/meta_basic.x
 	$(RPCGEN) $(RPCGENFLAGS) -c $(SRC)/uts/common/sys/lvm/meta_basic.x | \
-	nawk '{sub(/uts\/common\/sys\/lvm/, "head"); print $$0}' >$@
+	$(AWK) '{sub(/uts\/common\/sys\/lvm/, "head"); print $$0}' >$@
 
 metad_clnt.c: $(SRC)/head/metad.x 
 	$(RPCGEN) $(RPCGENFLAGS) -l $(SRC)/head/metad.x -o $@
@@ -174,11 +173,11 @@ metad_xdr.c: $(SRC)/head/metad.x
 
 metamed_clnt.c: $(SRC)/uts/common/sys/lvm/metamed.x
 	$(RPCGEN) $(RPCGENFLAGS) -l $(SRC)/uts/common/sys/lvm/metamed.x | \
-	nawk '{sub(/uts\/common\/sys\/lvm/, "head"); print $$0}' >$@
+	$(AWK) '{sub(/uts\/common\/sys\/lvm/, "head"); print $$0}' >$@
 
 metamed_xdr.c: $(SRC)/uts/common/sys/lvm/metamed.x 
 	$(RPCGEN) $(RPCGENFLAGS) -c $(SRC)/uts/common/sys/lvm/metamed.x | \
-	nawk '{sub(/uts\/common\/sys\/lvm/, "head"); print $$0}' >$@
+	$(AWK) '{sub(/uts\/common\/sys\/lvm/, "head"); print $$0}' >$@
 
 metamhd_clnt.c: $(SRC)/head/metamhd.x 
 	$(RPCGEN) $(RPCGENFLAGS) -l $(SRC)/head/metamhd.x -o $@
@@ -188,7 +187,7 @@ metamhd_xdr.c: $(SRC)/head/metamhd.x
 
 mhdx_xdr.c: $(SRC)/uts/common/sys/lvm/mhdx.x
 	$(RPCGEN) $(RPCGENFLAGS) -c $(SRC)/uts/common/sys/lvm/mhdx.x | \
-	nawk '{sub(/uts\/common\/sys\/lvm/, "head"); print $$0}' >$@
+	$(AWK) '{sub(/uts\/common\/sys\/lvm/, "head"); print $$0}' >$@
 
 mdmn_commd_xdr.c: $(SRC)/uts/common/sys/lvm/mdmn_commd.x
 	$(RPCGEN) -c $(SRC)/uts/common/sys/lvm/mdmn_commd.x -o $@
diff --git a/usr/src/lib/smbsrv/libsmb/Makefile b/usr/src/lib/smbsrv/libsmb/Makefile
index 1477f0ce9c..8aad6f1bc3 100644
--- a/usr/src/lib/smbsrv/libsmb/Makefile
+++ b/usr/src/lib/smbsrv/libsmb/Makefile
@@ -20,6 +20,7 @@
 #
 #
 # Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright 2015 Igor Kozhukhov <ikozhukhov@gmail.com>
 #
 
 HDRS=	libsmb.h
@@ -32,5 +33,5 @@ all install lint: $(GENSRCS)
 include ../Makefile.smbsrv
 
 $(GENSRCS): common/smb_status_gen.awk $(SRC)/uts/common/smb/ntstatus.h
-	nawk -f common/smb_status_gen.awk \
+	$(AWK) -f common/smb_status_gen.awk \
 	  $(SRC)/uts/common/smb/ntstatus.h > $@
diff --git a/usr/src/pkg/Makefile b/usr/src/pkg/Makefile
index 4a62f7f231..35a7f6e27d 100644
--- a/usr/src/pkg/Makefile
+++ b/usr/src/pkg/Makefile
@@ -22,6 +22,7 @@
 #
 # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
 # Copyright 2015, OmniTI Computer Consulting, Inc. All rights reserved.
+# Copyright 2015 Igor Kozhukhov <ikozhukhov@gmail.com>
 #
 
 include $(SRC)/Makefile.master
@@ -624,7 +625,7 @@ $(PKGLISTS): $(PROC_PKGS)
 	r=$${sdotr%.+(?)}; s=$${sdotr#+(?).}; \
 	print "Generating $$r $$s package list"; \
 	$(RM) $(@); $(TOUCH) $(@); \
-	$(NAWK) 'BEGIN { \
+	$(AWK) 'BEGIN { \
 		if (ARGC < 2) { \
 			exit; \
 		} \
@@ -677,7 +678,7 @@ license-list: makesilent
 stage-licenses: license-list FRC
 	$(PKGDEBUG)$(MAKE) -e -f Makefile.lic \
 		PKGDEBUG=$(PKGDEBUG) LICROOT=$(PKGROOT)/licenses \
-		`$(NAWK) '{ \
+		`$(AWK) '{ \
 			print "$(PKGROOT)/licenses/" $$0; \
 			print "$(PKGROOT)/licenses/" $$0 ".descrip"; \
 		}' license-list` > /dev/null;
diff --git a/usr/src/uts/common/io/lvm/md/Makefile b/usr/src/uts/common/io/lvm/md/Makefile
index 355b1881d3..7d568aab84 100644
--- a/usr/src/uts/common/io/lvm/md/Makefile
+++ b/usr/src/uts/common/io/lvm/md/Makefile
@@ -23,6 +23,7 @@
 # Use is subject to license terms.
 #
 # Copyright 2013 Nexenta Systems, Inc.  All rights reserved.
+# Copyright 2015 Igor Kozhukhov <ikozhukhov@gmail.com>
 #
 
 # Path to the base of the uts directory tree (usually /usr/src/uts).
@@ -50,7 +51,7 @@ clobber: clean
 
 %_xdr.c:	$(MD_XDR_XSRC)/%.x
 	$(RPCGEN) $(RPCGENFLAGS) -c -i 100 $(MD_XDR_XSRC)/$*.x | \
-$(NAWK) '/^#include/ {\
+$(AWK) '/^#include/ {\
     sub(/(\.\.\/)*common\//,"");\
     sub(/meta_basic.h/, "md_basic.h");\
     sub(/metamed.h/, "mdmed.h");\
diff --git a/usr/src/uts/common/sys/Makefile b/usr/src/uts/common/sys/Makefile
index 39288d5cc0..ed02832500 100644
--- a/usr/src/uts/common/sys/Makefile
+++ b/usr/src/uts/common/sys/Makefile
@@ -24,6 +24,7 @@
 # Copyright 2013 Garrett D'Amore <garrett@damore.org>
 # Copyright 2013 Saso Kiselkov. All rights reserved.
 # Copyright 2015 Nexenta Systems, Inc. All rights reserved.
+# Copyright 2015 Igor Kozhukhov <ikozhukhov@gmail.com>
 #
 
 include $(SRC)/uts/Makefile.uts
@@ -1342,13 +1343,13 @@ install_h:			\
 all_h: $(GENHDRS)
 
 priv_const.h: $(PRIVS_AWK) $(PRIVS_DEF)
-	$(NAWK) -f $(PRIVS_AWK) < $(PRIVS_DEF) -v privhfile=$@
+	$(AWK) -f $(PRIVS_AWK) < $(PRIVS_DEF) -v privhfile=$@
 
 priv_names.h: $(PRIVS_AWK) $(PRIVS_DEF)
-	$(NAWK) -f $(PRIVS_AWK) < $(PRIVS_DEF) -v pubhfile=$@
+	$(AWK) -f $(PRIVS_AWK) < $(PRIVS_DEF) -v pubhfile=$@
 
 usb/usbdevs.h: $(USBDEVS_AWK) $(USBDEVS_DATA)
-	$(NAWK) -f $(USBDEVS_AWK) $(USBDEVS_DATA) -H > $@
+	$(AWK) -f $(USBDEVS_AWK) $(USBDEVS_DATA) -H > $@
 
 LVMDERIVED_H:
 	cd $(SRC)/uts/common/sys/lvm; pwd; $(MAKE) all_h
diff --git a/usr/src/uts/common/sys/lvm/Makefile b/usr/src/uts/common/sys/lvm/Makefile
index dd7fe5ab4d..5a21d577ea 100644
--- a/usr/src/uts/common/sys/lvm/Makefile
+++ b/usr/src/uts/common/sys/lvm/Makefile
@@ -22,6 +22,7 @@
 #
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
+# Copyright 2015 Igor Kozhukhov <ikozhukhov@gmail.com>
 #
 #
 # uts/common/sys/lvm/Makefile
@@ -57,28 +58,28 @@ clobber: clean
 
 md_basic.h:	meta_basic.x
 	$(RPCGEN) $(RPCGENFLAGS) -h meta_basic.x  | \
-	awk '/<synch.h>/ { print "#ifdef _REENTRANT"; print $$0; print "#endif\t/* _REENTRANT */"; next } \
+	$(AWK) '/<synch.h>/ { print "#ifdef _REENTRANT"; print $$0; print "#endif\t/* _REENTRANT */"; next } \
 	/<thread.h>/ { print "#ifdef _REENTRANT"; print $$0; print "#endif\t/* _REENTRANT */"; next } \
 		{ print $0 } \
 	' > $@
 
 md_mhdx.h:	mhdx.x
 	$(RPCGEN) $(RPCGENFLAGS) -h mhdx.x | \
-	awk '/<synch.h>/ { print "#ifdef _REENTRANT"; print $$0; print "#endif\t/* _REENTRANT */"; next } \
+	$(AWK) '/<synch.h>/ { print "#ifdef _REENTRANT"; print $$0; print "#endif\t/* _REENTRANT */"; next } \
 	/<thread.h>/ { print "#ifdef _REENTRANT"; print $$0; print "#endif\t/* _REENTRANT */"; next } \
 		{ print $0 } \
 	' > $@
 
 mdmed.h:	metamed.x
 	$(RPCGEN) $(RPCGENFLAGS) -h metamed.x | \
-	awk '/<synch.h>/ { print "#ifdef _REENTRANT"; print $$0; print "#endif\t/* _REENTRANT */"; next } \
+	$(AWK) '/<synch.h>/ { print "#ifdef _REENTRANT"; print $$0; print "#endif\t/* _REENTRANT */"; next } \
 	/<thread.h>/ { print "#ifdef _REENTRANT"; print $$0; print "#endif\t/* _REENTRANT */"; next } \
 		{ print $0 } \
 	' > $@
 
 md_mdiox.h:	mdiox.x
 	$(RPCGEN) $(RPCGENFLAGS) -h mdiox.x | \
-	awk '/<synch.h>/ { print "#ifdef _REENTRANT"; print $$0; print "#endif\t/* _REENTRANT */"; next } \
+	$(AWK) '/<synch.h>/ { print "#ifdef _REENTRANT"; print $$0; print "#endif\t/* _REENTRANT */"; next } \
 	/<thread.h>/ { print "#ifdef _REENTRANT"; print $$0; print "#endif\t/* _REENTRANT */"; next } \
 		{ print $0 } \
 	' > $@
diff --git a/usr/src/uts/i86pc/Makefile.rules b/usr/src/uts/i86pc/Makefile.rules
index fe6042a1e8..ff68c02eba 100644
--- a/usr/src/uts/i86pc/Makefile.rules
+++ b/usr/src/uts/i86pc/Makefile.rules
@@ -21,6 +21,7 @@
 
 #
 # Copyright (c) 1992, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright 2015 Igor Kozhukhov <ikozhukhov@gmail.com>
 #
 
 #	This Makefile defines the build rules for the directory uts/i86pc
@@ -306,7 +307,7 @@ $(OBJS_DIR)/%.o:		$(SRC)/common/atomic/$(ATOMIC_SUBDIR)/%.s
 
 $(OBJS_DIR)/dtracestubs.s:	$(UNIX_O) $(LIBS)
 	$(NM) -u $(UNIX_O) $(LIBS) | $(GREP) __dtrace_probe_ | $(SORT) | \
-	    $(UNIQ) | $(NAWK) '{ \
+	    $(UNIQ) | $(AWK) '{ \
 	    printf("\t.globl %s\n\t.type %s,@function\n%s:\n", \
 	    $$1, $$1, $$1); }' > $(OBJS_DIR)/dtracestubs.s
 
diff --git a/usr/src/uts/i86pc/gfx_private/Makefile b/usr/src/uts/i86pc/gfx_private/Makefile
index 53001f9321..be3b8777e6 100644
--- a/usr/src/uts/i86pc/gfx_private/Makefile
+++ b/usr/src/uts/i86pc/gfx_private/Makefile
@@ -22,6 +22,7 @@
 # uts/i86pc/gfx_private/Makefile
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
+# Copyright 2015 Igor Kozhukhov <ikozhukhov@gmail.com>
 #
 
 #
@@ -100,7 +101,7 @@ install:	$(INSTALL_DEPS)
 # Custom targets and rules
 
 $(OBJS_DIR)/$(VGATEXT_FONT).c:	$(VGATEXT_SRC)/$(VGATEXT_FONT).bdf
-	awk -f $(VGATEXT_SRC)/bdf_to_c.awk	\
+	$(AWK) -f $(VGATEXT_SRC)/bdf_to_c.awk	\
 		$(VGATEXT_SRC)/$(VGATEXT_FONT).bdf > $@
 
 $(OBJS_DIR)/$(VGATEXT_FONT).o:	$(OBJS_DIR)/$(VGATEXT_FONT).c
diff --git a/usr/src/uts/i86xpv/gfx_private/Makefile b/usr/src/uts/i86xpv/gfx_private/Makefile
index f103eb9a04..ece55461b3 100644
--- a/usr/src/uts/i86xpv/gfx_private/Makefile
+++ b/usr/src/uts/i86xpv/gfx_private/Makefile
@@ -22,6 +22,7 @@
 #
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
+# Copyright 2015 Igor Kozhukhov <ikozhukhov@gmail.com>
 #
 
 #
@@ -96,7 +97,7 @@ install:	$(INSTALL_DEPS)
 # Custom targets and rules
 
 $(OBJS_DIR)/$(VGATEXT_FONT).c:	$(VGATEXT_SRC)/$(VGATEXT_FONT).bdf
-	awk -f $(VGATEXT_SRC)/bdf_to_c.awk	\
+	$(AWK) -f $(VGATEXT_SRC)/bdf_to_c.awk	\
 		$(VGATEXT_SRC)/$(VGATEXT_FONT).bdf > $@
 
 $(OBJS_DIR)/$(VGATEXT_FONT).o:	$(OBJS_DIR)/$(VGATEXT_FONT).c
diff --git a/usr/src/uts/intel/Makefile b/usr/src/uts/intel/Makefile
index 72b2d89989..fe4e8f3538 100644
--- a/usr/src/uts/intel/Makefile
+++ b/usr/src/uts/intel/Makefile
@@ -21,6 +21,7 @@
 # uts/intel/Makefile
 #
 # Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright 2015 Igor Kozhukhov <ikozhukhov@gmail.com>
 #
 #	This makefile drives the production of all implementation architecture
 #	independent modules for Intel processors.
@@ -78,7 +79,7 @@ clobber: clobber.targ
 PRIVS_C = $(SRC)/uts/common/os/priv_const.c
 
 $(PRIVS_C): $(PRIVS_AWK) $(PRIVS_DEF)
-	$(NAWK) -f $(PRIVS_AWK) < $(PRIVS_DEF) cfile=$@
+	$(AWK) -f $(PRIVS_AWK) < $(PRIVS_DEF) cfile=$@
 
 CLOBBERFILES += $(PRIVS_C)
 
diff --git a/usr/src/uts/intel/config/Makefile b/usr/src/uts/intel/config/Makefile
index c2c79f8697..66a8e5ec02 100644
--- a/usr/src/uts/intel/config/Makefile
+++ b/usr/src/uts/intel/config/Makefile
@@ -21,6 +21,7 @@
 #
 # uts/intel/config/Makefile
 # Copyright 2010 Nexenta Systems, Inc.  All rights reserved.
+# Copyright 2015 Igor Kozhukhov <ikozhukhov@gmail.com>
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
@@ -114,7 +115,7 @@ $(BOOTDEVICEDB)/%: $(BOOTDEVICEDB) $(SRCDIR)/%
 	$(INS.file)
 
 $(SRCDIR)/priv_names: $(PRIVS_DEF) $(PRIVS_AWK)
-	$(NAWK) -f $(PRIVS_AWK) < $(PRIVS_DEF) -v pnamesfile=$@
+	$(AWK) -f $(PRIVS_AWK) < $(PRIVS_DEF) -v pnamesfile=$@
 
 clean lint:
 clobber: clobber.targ
diff --git a/usr/src/uts/intel/vgatext/Makefile b/usr/src/uts/intel/vgatext/Makefile
index 3f15372b40..ca7e5b67f5 100644
--- a/usr/src/uts/intel/vgatext/Makefile
+++ b/usr/src/uts/intel/vgatext/Makefile
@@ -22,6 +22,7 @@
 # uts/intel/vgatext/Makefile
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
+# Copyright 2015 Igor Kozhukhov <ikozhukhov@gmail.com>
 #
 
 #
@@ -93,7 +94,7 @@ install:	$(INSTALL_DEPS)
 # Custom targets and rules
 
 $(OBJS_DIR)/$(VGATEXT_FONT).c:	$(VGATEXT_SRC)/$(VGATEXT_FONT).bdf
-	awk -f $(VGATEXT_SRC)/bdf_to_c.awk	\
+	$(AWK) -f $(VGATEXT_SRC)/bdf_to_c.awk	\
 		$(VGATEXT_SRC)/$(VGATEXT_FONT).bdf > $@
 
 $(OBJS_DIR)/$(VGATEXT_FONT).o:	$(OBJS_DIR)/$(VGATEXT_FONT).c
diff --git a/usr/src/uts/sparc/config/Makefile b/usr/src/uts/sparc/config/Makefile
index 8f5c587049..3dea9d543f 100644
--- a/usr/src/uts/sparc/config/Makefile
+++ b/usr/src/uts/sparc/config/Makefile
@@ -22,6 +22,7 @@
 # uts/sparc/config/Makefile
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
+# Copyright 2015 Igor Kozhukhov <ikozhukhov@gmail.com>
 #
 #	This makefile drives the production of the kernel configuration files.
 #
@@ -77,7 +78,7 @@ $(ROOTETCSEC)/%: $(SRCDIR)/%
 	$(INS.file)
 
 $(SRCDIR)/priv_names: $(PRIVS_DEF) $(PRIVS_AWK)
-	$(NAWK) -f $(PRIVS_AWK) < $(PRIVS_DEF) -v pnamesfile=$@
+	$(AWK) -f $(PRIVS_AWK) < $(PRIVS_DEF) -v pnamesfile=$@
 
 clean lint:
 clobber: clobber.targ
diff --git a/usr/src/uts/sun4u/Makefile b/usr/src/uts/sun4u/Makefile
index f98f4b2eb4..37bf74365a 100644
--- a/usr/src/uts/sun4u/Makefile
+++ b/usr/src/uts/sun4u/Makefile
@@ -21,6 +21,7 @@
 #
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
+# Copyright 2015 Igor Kozhukhov <ikozhukhov@gmail.com>
 #
 #	This makefile drives the production of all implementation architecture
 #	dependent modules for the sun4u architecture.
@@ -112,7 +113,7 @@ genassym unix $(KMODS):	FRC
 PRIVS_C = $(UTSBASE)/common/os/priv_const.c
 
 $(PRIVS_C): $(PRIVS_AWK) $(PRIVS_DEF)
-	$(NAWK) -f $(PRIVS_AWK) < $(PRIVS_DEF) cfile=$@
+	$(AWK) -f $(PRIVS_AWK) < $(PRIVS_DEF) cfile=$@
 
 CLOBBERFILES += $(PRIVS_C)
 
diff --git a/usr/src/uts/sun4u/Makefile.rules b/usr/src/uts/sun4u/Makefile.rules
index 2e16caa648..f16022e6fc 100644
--- a/usr/src/uts/sun4u/Makefile.rules
+++ b/usr/src/uts/sun4u/Makefile.rules
@@ -22,6 +22,7 @@
 #
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
+# Copyright 2015 Igor Kozhukhov <ikozhukhov@gmail.com>
 #
 #	This Makefile defines the build rules for the directory uts/sun4u
 #	and its children. These are the source files which sun4u
@@ -170,7 +171,7 @@ $(OBJS_DIR)/%.o:		$(SRC)/common/atomic/sparcv9/%.s
 
 $(OBJS_DIR)/dtracestubs.s:	$(UNIX_O) $(LIBS)
 	$(NM) -u $(UNIX_O) $(LIBS) | $(GREP) __dtrace_probe_ | $(SORT) | \
-	    $(UNIQ) | $(NAWK) '{ \
+	    $(UNIQ) | $(AWK) '{ \
 	    printf("\t.global %s\n\t.type %s, #function\n%s:\n", \
 	    $$1, $$1, $$1); }' > $(OBJS_DIR)/dtracestubs.s
 
diff --git a/usr/src/uts/sun4v/Makefile.rules b/usr/src/uts/sun4v/Makefile.rules
index 2f4730140a..7675e358fd 100644
--- a/usr/src/uts/sun4v/Makefile.rules
+++ b/usr/src/uts/sun4v/Makefile.rules
@@ -21,6 +21,7 @@
 
 #
 # Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright 2015 Igor Kozhukhov <ikozhukhov@gmail.com>
 #
 
 #
@@ -162,7 +163,7 @@ $(OBJS_DIR)/%.o:		$(SRC)/common/crypto/arcfour/sun4v/%.c
 
 $(OBJS_DIR)/dtracestubs.s:	$(UNIX_O) $(LIBS)
 	$(NM) -u $(UNIX_O) $(LIBS) | $(GREP) __dtrace_probe_ | $(SORT) | \
-	    $(UNIQ) | $(NAWK) '{ \
+	    $(UNIQ) | $(AWK) '{ \
 	    printf("\t.global %s\n\t.type %s, #function\n%s:\n", \
 	    $$1, $$1, $$1); }' > $(OBJS_DIR)/dtracestubs.s