Bug#358702: FTBFS: bdftopcf.1x / bdftopcf.1 confusion
Hi,
I think the better is to make GNU/Hurd use the same manpage suffixes as
GNU/Linux does. GNU/k*BSD already got modified in CVS for that (the
relevant file is xorg/util/macros/xorg-macros.m4) and #6782 has been
filed to do the same. I've also updated #363483 to have those changes
included in /usr/share/aclocal/xorg-macros.m4.
xfonts-utils (and xutils AFAICT) still need to be updated for that,
though, so I have attached a patch for aclocal.m4 configure (as it does
not appear to Build-Depend on xutils-dev, so rerunning them after
#363483 is fixed will not help)
cheers,
Michael
only in patch2:
unchanged:
--- xfonts-utils-1.0.0.orig/bdftopcf-X11R7.0-1.0.0/configure
+++ xfonts-utils-1.0.0/bdftopcf-X11R7.0-1.0.0/configure
@@ -3181,40 +3175,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
@@ -3223,14 +3217,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
@@ -3239,14 +3233,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
only in patch2:
unchanged:
--- xfonts-utils-1.0.0.orig/bdftopcf-X11R7.0-1.0.0/aclocal.m4
+++ xfonts-utils-1.0.0/bdftopcf-X11R7.0-1.0.0/aclocal.m4
@@ -1136,40 +1136,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
@@ -1178,14 +1178,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
@@ -1194,14 +1194,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
only in patch2:
unchanged:
--- xfonts-utils-1.0.0.orig/mkfontdir-X11R7.0-1.0.1/configure
+++ xfonts-utils-1.0.0/mkfontdir-X11R7.0-1.0.1/configure
@@ -1856,40 +1856,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
@@ -1898,14 +1898,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
@@ -1914,14 +1914,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
only in patch2:
unchanged:
--- xfonts-utils-1.0.0.orig/mkfontdir-X11R7.0-1.0.1/aclocal.m4
+++ xfonts-utils-1.0.0/mkfontdir-X11R7.0-1.0.1/aclocal.m4
@@ -953,40 +953,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
@@ -995,14 +995,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
@@ -1011,14 +1011,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
only in patch2:
unchanged:
--- xfonts-utils-1.0.0.orig/mkfontscale-X11R7.0-1.0.1/configure
+++ xfonts-utils-1.0.0/mkfontscale-X11R7.0-1.0.1/configure
@@ -3384,40 +3377,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
@@ -3426,14 +3419,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
@@ -3442,14 +3435,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
only in patch2:
unchanged:
--- xfonts-utils-1.0.0.orig/mkfontscale-X11R7.0-1.0.1/aclocal.m4
+++ xfonts-utils-1.0.0/mkfontscale-X11R7.0-1.0.1/aclocal.m4
@@ -1136,40 +1136,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
@@ -1178,14 +1178,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
@@ -1194,14 +1194,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
only in patch2:
unchanged:
--- xfonts-utils-1.0.0.orig/font-util-X11R7.0-1.0.0/configure
+++ xfonts-utils-1.0.0/font-util-X11R7.0-1.0.0/configure
@@ -2958,40 +2952,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
@@ -3000,14 +2994,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
@@ -3016,14 +3010,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
only in patch2:
unchanged:
--- xfonts-utils-1.0.0.orig/font-util-X11R7.0-1.0.0/aclocal.m4
+++ xfonts-utils-1.0.0/font-util-X11R7.0-1.0.0/aclocal.m4
@@ -979,40 +979,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
@@ -1021,14 +1021,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
@@ -1037,14 +1037,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
Reply to: