Rich's feedback

@@ -8,11 +8,11 @@
 # source.  A copy of the CDDL is also available via the Internet at
 # http://www.illumos.org/license/CDDL.
 #
 
 #
-# Copyright 2017 Jason King.
+# Copyright 2018 Jason King.
 #
 
 include $(SRC)/Makefile.master
 include $(SRC)/cmd/Makefile.cmd
 include $(SRC)/test/Makefile.com

@@ -28,13 +28,13 @@
 $(CMDS) := FILEMODE = 0555
 
 OBJS = $(PROG:%=%.o)
 SRCS = $(OBJS:%.o=%.c)
 
-C99MODE= $(C99_ENABLE)
+CSTD = $(CSTD_GNU99)
 
-LDLIBS += -lsysdemangle
+LDLIBS += -ldemangle-sys
 
 all: $(PROG)
 
 gcc-libstdc++: gcc-libstdc++.o
         $(LINK.c) -o $@ gcc-libstdc++.o $(LDLIBS)