===================================================================
RCS file: /cvs/mandoc/mandocdb.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- mandoc/mandocdb.c	2011/12/09 11:16:34	1.31
+++ mandoc/mandocdb.c	2011/12/10 16:53:39	1.32
@@ -1,4 +1,4 @@
-/*	$Id: mandocdb.c,v 1.31 2011/12/09 11:16:34 schwarze Exp $ */
+/*	$Id: mandocdb.c,v 1.32 2011/12/10 16:53:39 schwarze Exp $ */
 /*
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>
@@ -579,14 +579,14 @@ index_merge(const struct of *of, struct mparse *mp,
 		if (0 == use_all) {
 			assert(of->sec);
 			assert(msec);
-			if (strcmp(msec, of->sec))
+			if (strcasecmp(msec, of->sec))
 				continue;
 
 			if (NULL == arch) {
 				if (NULL != of->arch)
 					continue;
 			} else if (NULL == of->arch ||
-					strcmp(arch, of->arch))
+					strcasecmp(arch, of->arch))
 				continue;
 		}
 
@@ -1559,6 +1559,10 @@ ofile_dirbuild(const char *dir, const char* psec, cons
 			buf[0] = '\0';
 			strlcat(buf, dir, MAXPATHLEN);
 			p = strrchr(buf, '/');
+			if (NULL != parch && NULL != p)
+				for (p--; p > buf; p--)
+					if ('/' == *p)
+						break;
 			if (NULL == p)
 				p = buf;
 			else