Load cups into easysw/current.

[thirdparty/cups.git] / config-scripts / cups-manpages.m4

diff --git a/config-scripts/cups-manpages.m4 b/config-scripts/cups-manpages.m4
index 0c2c25161d87bdd21f1245e056947fa8943f20ec..71f1e60bad134a61807b38d8b70287058b515057 100644 (file)
--- a/config-scripts/cups-manpages.m4
+++ b/config-scripts/cups-manpages.m4
@@ -1,9 +1,9 @@
 dnl
 dnl

-dnl "$Id: cups-manpages.m4 5099 2006-02-13 02:46:10Z mike $"
+dnl "$Id: cups-manpages.m4 5798 2006-08-03 00:53:58Z mike $"

 dnl
 dnl   Manpage stuff for the Common UNIX Printing System (CUPS).
 dnl
 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
 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         WWW: http://www.cups.org
 dnl
 
 dnl Fix "mandir" variable...
 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*)
 if test "$mandir" = "\${prefix}/man" -a "$prefix" = "/"; then
        case "$uname" in
                Darwin* | Linux | GNU | *BSD* | AIX*)


@@ -103,5 +109,5 @@ AC_SUBST(MAN8EXT)
 AC_SUBST(MAN8DIR)
 
 dnl
 AC_SUBST(MAN8DIR)
 
 dnl

-dnl End of "$Id: cups-manpages.m4 5099 2006-02-13 02:46:10Z mike $".
+dnl End of "$Id: cups-manpages.m4 5798 2006-08-03 00:53:58Z mike $".

 dnl
 dnl