Remove some WIP bits that I didn't fully clean out before merging to HEAD.

gnu/usr.bin/cc/c++filt/Makefile

@@ -2,7 +2,7 @@
 
 .include "../Makefile.inc"
 
-.PATH: ${GCCDIR}			${GCCDIR}/../libiberty
+.PATH: ${GCCDIR}
 
 PROG=	c++filt
 SRCS=	cp-demangle.c cplus-dem+%DIKED.c
@@ -15,8 +15,7 @@ DPADD+=	${LIBCC_INT}
 LDADD+=	${LIBCC_INT}
 
 cplus-dem+%DIKED.c: cplus-dem.c
-	sed \
-	    -e 's/^xmalloc[ 	]/_DONT_xmalloc /g' \
+	sed -e 's/^xmalloc[ 	]/_DONT_xmalloc /g' \
 	    -e 's/^xrealloc[ 	]/_DONT_xrealloc /g' \
 	    ${.ALLSRC} > ${.TARGET}