Address Robert's feedback

@@ -1,59 +1,41 @@
 #
-# CDDL HEADER START
+# This file and its contents are supplied under the terms of the
+# Common Development and Distribution License ("CDDL"), version 1.0.
+# You may only use this file in accordance with the terms of version
+# 1.0 of the CDDL.
 #
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
+# A full copy of the text of the CDDL should have accompanied this
+# source.  A copy of the CDDL is also available via the Internet at
+# http://www.illumos.org/license/CDDL.
 #
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
+# Copyright 2017 Jason King.
+# Copyright (c) 2017, Joyent. Inc.  All Rights Reserved.
 #
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
 
 include         ../Makefile.lib
 
 HDRS =          sysdemangle.h
-ROOTHDRDIR=     $(ROOT)/usr/include
-ROOTHDRS=       $(HDRS:%=$(ROOTHDRDIR)/%)
-CHECKHDRS=      $(HDRS:%.h=common/%.check)
+HDRDIR =                common
+SUBDIRS =               $(MACH)
+$(BUILD64)SUBDIRS +=    $(MACH64)
 
-$(ROOTHDRS) :=  FILEMODE= 644
-
-$(ROOTHDRDIR)/%: common/%
-        $(INS.file)
-
-SUBDIRS =       $(MACH) $(BUILD64) $(MACH64)
-
 all :=          TARGET= all
 clean :=        TARGET= clean
 clobber :=      TARGET= clobber
 install :=      TARGET= install
 lint :=         TARGET= lint
 
 .KEEP_STATE:
 
-all clean clobber install: $(SUBDIRS)
+all clean clobber install lint: $(SUBDIRS)
 
-lint:
-
 $(SUBDIRS):     FRC
         @cd $@; pwd; $(MAKE) $(TARGET)
 
 install_h:      $(ROOTHDRS)
 
 check:          $(CHECKHDRS)
 
 FRC:
+
+include ../Makefile.targ