===================================================================
RCS file: /cvs/mandoc/Makefile,v
retrieving revision 1.441
retrieving revision 1.442
diff -u -p -r1.441 -r1.442
--- mandoc/Makefile	2014/08/16 23:04:25	1.441
+++ mandoc/Makefile	2014/08/17 03:24:47	1.442
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.441 2014/08/16 23:04:25 schwarze Exp $
+# $Id: Makefile,v 1.442 2014/08/17 03:24:47 schwarze Exp $
 #
 # Copyright (c) 2010, 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
 # Copyright (c) 2011, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -35,8 +35,7 @@ TESTSRCS	 = test-dirent-namlen.c \
 		   test-strsep.c \
 		   test-wchar.c
 
-SRCS		 = apropos.c \
-		   arch.c \
+SRCS		 = arch.c \
 		   att.c \
 		   cgi.c \
 		   chars.c \
@@ -228,7 +227,7 @@ MAKEWHATIS_OBJS	 = mandocdb.o mansearch_const.o manpat
 
 PRECONV_OBJS	 = preconv.o
 
-APROPOS_OBJS	 = apropos.o mansearch.o mansearch_const.o manpath.o
+APROPOS_OBJS	 = mansearch.o mansearch_const.o manpath.o
 
 CGI_OBJS	 = $(MANDOC_HTML_OBJS) \
 		   cgi.o \
@@ -369,7 +368,8 @@ Makefile.local config.h: configure ${TESTSRCS}
 depend: config.h
 	mkdep -f Makefile.depend $(CFLAGS) $(SRCS)
 	perl -e 'undef $$/; $$_ = <>; s|/usr/include/\S+||g; \
-		s|\\\n||g; s|  +| |g; print;' Makefile.depend > Makefile.tmp
+		s|\\\n||g; s|  +| |g; s| $$||mg; print;' \
+		Makefile.depend > Makefile.tmp
 	mv Makefile.tmp Makefile.depend
 
 libmandoc.a: $(COMPAT_OBJS) $(LIBMANDOC_OBJS)