retitle 363483 xutils-dev: FTBFS on k*bsd and hurd-i386: Wrong manpage suffixes
thanks
Hi,
the same changes are needed for GNU/Hurd, a patch has been filed
upstream at
https://bugs.freedesktop.org/show_bug.cgi?id=6782
I've attached a unified patch for both #6654 and #6782, please apply
and rerun aclocal as this one patches xorg-macros.m4 rather than
aclocal.m4.
thanks,
Michael
--- util-macros-1.0.1/xorg-macros.m4 2006-04-16 01:11:55.000000000 +0200
+++ util-macros-1.0.1/xorg-macros.m4.new 2006-04-29 13:22:16.000000000
+0200
@@ -1,4 +1,4 @@
-dnl $Id: xorg-macros.m4,v 1.8 2005/12/09 15:28:41 kem Exp $
+dnl $Id: xorg-macros.m4,v 1.9 2006/04/21 22:47:13 alanc Exp $
dnl
dnl Copyright 2005 Sun Microsystems, Inc. All rights reserved.
dnl
@@ -79,40 +79,40 @@
if test x$APP_MAN_SUFFIX = x ; then
case $host_os in
- linux*) APP_MAN_SUFFIX=1x ;;
+ linux* | gnu* | k*bsd*-gnu) APP_MAN_SUFFIX=1x ;;
*) APP_MAN_SUFFIX=1 ;;
esac
fi
if test x$APP_MAN_DIR = x ; then
case $host_os in
- linux*) APP_MAN_DIR='$(mandir)/man1' ;;
+ linux* | gnu* | k*bsd*-gnu) APP_MAN_DIR='$(mandir)/man1' ;;
*) APP_MAN_DIR='$(mandir)/man$(APP_MAN_SUFFIX)' ;;
esac
fi
if test x$LIB_MAN_SUFFIX = x ; then
case $host_os in
- linux*) LIB_MAN_SUFFIX=3x ;;
+ linux* | gnu* | k*bsd*-gnu) LIB_MAN_SUFFIX=3x ;;
*) LIB_MAN_SUFFIX=3 ;;
esac
fi
if test x$LIB_MAN_DIR = x ; then
case $host_os in
- linux*) LIB_MAN_DIR='$(mandir)/man3' ;;
+ linux* | gnu* | k*bsd*-gnu) LIB_MAN_DIR='$(mandir)/man3' ;;
*) LIB_MAN_DIR='$(mandir)/man$(LIB_MAN_SUFFIX)' ;;
esac
fi
if test x$FILE_MAN_SUFFIX = x ; then
case $host_os in
- linux*) FILE_MAN_SUFFIX=5x ;;
+ linux* | gnu* | k*bsd*-gnu) FILE_MAN_SUFFIX=5x ;;
solaris*) FILE_MAN_SUFFIX=4 ;;
*) FILE_MAN_SUFFIX=5 ;;
esac
fi
if test x$FILE_MAN_DIR = x ; then
case $host_os in
- linux*) FILE_MAN_DIR='$(mandir)/man5' ;;
+ linux* | gnu* | k*bsd*-gnu) FILE_MAN_DIR='$(mandir)/man5' ;;
*) FILE_MAN_DIR='$(mandir)/man$(FILE_MAN_SUFFIX)' ;;
esac
fi
@@ -121,14 +121,14 @@
# LinuxDebian, not other Linuxes, so we leave it unchanged here
if test x$MISC_MAN_SUFFIX = x ; then
case $host_os in
-# linux*) MISC_MAN_SUFFIX=7x ;;
+# linux* | gnu* | k*bsd*-gnu) MISC_MAN_SUFFIX=7x ;;
solaris*) MISC_MAN_SUFFIX=5 ;;
*) MISC_MAN_SUFFIX=7 ;;
esac
fi
if test x$MISC_MAN_DIR = x ; then
case $host_os in
-# linux*) MISC_MAN_DIR='$(mandir)/man7' ;;
+# linux* | gnu* | k*bsd*-gnu) MISC_MAN_DIR='$(mandir)/man7' ;;
*) MISC_MAN_DIR='$(mandir)/man$(MISC_MAN_SUFFIX)' ;;
esac
fi
@@ -137,14 +137,14 @@
# LinuxDebian, not other Linuxes, so we leave it unchanged here
if test x$DRIVER_MAN_SUFFIX = x ; then
case $host_os in
-# linux*) DRIVER_MAN_SUFFIX=4x ;;
+# linux* | gnu* | k*bsd*-gnu) DRIVER_MAN_SUFFIX=4x ;;
solaris*) DRIVER_MAN_SUFFIX=7 ;;
*) DRIVER_MAN_SUFFIX=4 ;;
esac
fi
if test x$DRIVER_MAN_DIR = x ; then
case $host_os in
-# linux*) DRIVER_MAN_DIR='$(mandir)/man4' ;;
+# linux* | gnu* | k*bsd*-gnu) DRIVER_MAN_DIR='$(mandir)/man4' ;;
*) DRIVER_MAN_DIR='$(mandir)/man$(DRIVER_MAN_SUFFIX)' ;;
esac
fi
