--- usr/bin/cygport	2008-10-28 06:08:16.000000000 +0000
+++ /usr/bin/cygport	2008-12-29 19:17:27.000000000 +0000
@@ -1116,14 +1116,22 @@ cygconf() {
 	# Set default configure arguments
 	confargs="--prefix=/usr --exec-prefix=/usr --bindir=/usr/bin \
 			  --sbindir=/usr/sbin --libexecdir=/usr/sbin \
-			  --datadir=/usr/share --localstatedir=/var --sysconfdir=/etc"
+			  --localstatedir=/var --sysconfdir=/etc"
 
 	case "x$(grep -m 1 'GNU Autoconf' ${configure} | cut -d ' ' -f 6)" in
 		x2.6[0-9]*)
-			confargs+=" --datarootdir=/usr/share --docdir=/usr/share/doc/${P}"
+			if ! defined CYGCONF_NOEXTRADIRS
+			then
+				confargs+="  --datarootdir=/usr/share "
+	  			confargs+="  --docdir=/usr/share/doc/${P}"
+			fi
 			;;
 		*)
-			confargs+=" --infodir=/usr/share/info --mandir=/usr/share/man"
+			if ! defined CYGCONF_NOEXTRADIRS
+			then
+				confargs+=" --datadir=/usr/share --infodir=/usr/share/info \
+					--mandir=/usr/share/man"
+			fi
 			;;
 	esac