Index: cups-config.in
===================================================================
--- cups-config.in	(revision 5797)
+++ cups-config.in	(working copy)
@@ -32,6 +32,7 @@
 includedir=@includedir@
 libdir=@libdir@
 imagelibdir=@libdir@
+datarootdir=@datadir@
 datadir=@datadir@
 sysconfdir=@sysconfdir@
 cups_datadir=@CUPS_DATADIR@
Index: packaging/cups.list.in
===================================================================
--- packaging/cups.list.in	(revision 5797)
+++ packaging/cups.list.in	(working copy)
@@ -122,6 +122,7 @@
 $prefix=@prefix@
 $exec_prefix=@exec_prefix@
 $bindir=@bindir@
+$datarootdir=@datarootdir@
 $datadir=@datadir@
 $includedir=@includedir@
 $infodir=@infodir@
Index: Makedefs.in
===================================================================
--- Makedefs.in	(revision 5797)
+++ Makedefs.in	(working copy)
@@ -174,12 +174,16 @@
 # We have to define these first because autoconf uses ${prefix}
 # and ${exec_prefix} for most of the other directories...
 #
+# The "datarootdir" variable may not get defined if you are using
+# a version of autoconf prior to 2.60.
+#
 # This is immediately followed by definition in ALL CAPS for the
 # needed directories...
 #
 
 bindir		=	@bindir@
 datadir		=	@datadir@
+datarootdir	=	@datarootdir@
 exec_prefix	=	@exec_prefix@
 includedir	=	@includedir@
 infodir		=	@infodir@
Index: config-scripts/cups-manpages.m4
===================================================================
--- config-scripts/cups-manpages.m4	(revision 5797)
+++ config-scripts/cups-manpages.m4	(working copy)
@@ -3,7 +3,7 @@
 dnl
 dnl   Manpage stuff for the Common UNIX Printing System (CUPS).
 dnl
-dnl   Copyright 1997-2005 by Easy Software Products, all rights reserved.
+dnl   Copyright 1997-2006 by Easy Software Products, all rights reserved.
 dnl
 dnl   These coded instructions, statements, and computer programs are the
 dnl   property of Easy Software Products and are protected by Federal
@@ -23,6 +23,12 @@
 dnl
 
 dnl Fix "mandir" variable...
+if test "$mandir" = "\${datarootdir}/man" -a "$prefix" = "/"; then
+	# New GNU "standards" break previous ones, so make sure we use
+	# the right default location for the operating system...
+	mandir="\${prefix}/man"
+fi
+
 if test "$mandir" = "\${prefix}/man" -a "$prefix" = "/"; then
 	case "$uname" in
         	Darwin* | Linux | GNU | *BSD* | AIX*)
Index: config-scripts/cups-directories.m4
===================================================================
--- config-scripts/cups-directories.m4	(revision 5797)
+++ config-scripts/cups-directories.m4	(working copy)
@@ -57,6 +57,15 @@
 	sharedstatedir="/usr/com"
 fi
 
+dnl Fix "datarootdir" variable if it hasn't been specified...
+if test "$datarootdir" = "\${prefix}/share"; then
+	if test "$prefix" = "/"; then
+		datarootdir="/usr/share"
+	else
+		datarootdir="$prefix/share"
+	fi
+fi
+
 dnl Fix "datadir" variable if it hasn't been specified...
 if test "$datadir" = "\${prefix}/share"; then
 	if test "$prefix" = "/"; then
@@ -64,6 +73,8 @@
 	else
 		datadir="$prefix/share"
 	fi
+elif test "$datadir" = "\${datarootdir}"; then
+	datadir="$datarootdir"
 fi
 
 dnl Fix "includedir" variable if it hasn't been specified...