$NetBSD: patch-ac,v 1.21 2014/07/21 07:50:45 richard Exp $

--- configure.orig	2011-03-31 23:35:51.000000000 +0000
+++ configure
@@ -9640,12 +9645,7 @@ case ".$MANPAGE_RENAMES" in #(vi
 .no) #(vi
   ;;
 .|.yes)
-  # Debian 'man' program?
-  if test -f /etc/debian_version ; then
-    MANPAGE_RENAMES=`cd $srcdir && pwd`/man/man_db.renames
-  else
     MANPAGE_RENAMES=no
-  fi
   ;;
 esac
 
@@ -18592,7 +18592,7 @@ echo "${ECHO_T}$LIB_SUBSETS" >&6
 
 ### Construct the list of include-directories to be generated
 
-CPPFLAGS="$CPPFLAGS -I. -I../include"
+CPPFLAGS="-I. -I../include $CPPFLAGS"
 if test "$srcdir" != "."; then
 	CPPFLAGS="$CPPFLAGS -I\${srcdir}/../include"
 fi
