diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2019-04-26 23:10:09 -0400 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2019-04-26 23:10:09 -0400 |
| commit | 87030afb3aa8735848c66a0526d06af69d7010c6 (patch) | |
| tree | 91cff9fc58fc3010481f320ec6acc37b4b2e961b /config-scripts | |
| parent | ea75e93d17738a9abb81514029949e661c730869 (diff) | |
| download | cups-87030afb3aa8735848c66a0526d06af69d7010c6.tar.gz | |
Greatly simplify the man page handling.
Diffstat (limited to 'config-scripts')
| -rw-r--r-- | config-scripts/cups-dnssd.m4 | 6 | ||||
| -rw-r--r-- | config-scripts/cups-manpages.m4 | 51 |
2 files changed, 7 insertions, 50 deletions
diff --git a/config-scripts/cups-dnssd.m4 b/config-scripts/cups-dnssd.m4 index daa398fd7..19832dc16 100644 --- a/config-scripts/cups-dnssd.m4 +++ b/config-scripts/cups-dnssd.m4 @@ -29,7 +29,7 @@ if test "x$PKGCONFIG" != x -a x$enable_avahi != xno -a x$host_os_name != xdarwin DNSSDLIBS="`$PKGCONFIG --libs avahi-client`" DNSSD_BACKEND="dnssd" IPPFIND_BIN="ippfind" - IPPFIND_MAN="ippfind.\$(MAN1EXT)" + IPPFIND_MAN="ippfind.1)" AC_DEFINE(HAVE_AVAHI) else AC_MSG_RESULT(no) @@ -44,7 +44,7 @@ if test "x$DNSSD_BACKEND" = x -a x$enable_dnssd != xno; then AC_DEFINE(HAVE_DNSSD) DNSSD_BACKEND="dnssd" IPPFIND_BIN="ippfind" - IPPFIND_MAN="ippfind.\$(MAN1EXT)" + IPPFIND_MAN="ippfind.1" ;; *) # All others... @@ -62,7 +62,7 @@ if test "x$DNSSD_BACKEND" = x -a x$enable_dnssd != xno; then DNSSDLIBS="-ldns_sd" DNSSD_BACKEND="dnssd", IPPFIND_BIN="ippfind" - IPPFIND_MAN="ippfind.\$(MAN1EXT)" + IPPFIND_MAN="ippfind.1" AC_MSG_RESULT(no)) LIBS="$SAVELIBS" ;; diff --git a/config-scripts/cups-manpages.m4 b/config-scripts/cups-manpages.m4 index b2a68a3f5..2277196ad 100644 --- a/config-scripts/cups-manpages.m4 +++ b/config-scripts/cups-manpages.m4 @@ -1,10 +1,11 @@ dnl dnl Manpage stuff for CUPS. dnl -dnl Copyright 2007-2017 by Apple Inc. -dnl Copyright 1997-2006 by Easy Software Products, all rights reserved. +dnl Copyright © 2007-2019 by Apple Inc. +dnl Copyright © 1997-2006 by Easy Software Products, all rights reserved. dnl -dnl Licensed under Apache License v2.0. See the file "LICENSE" for more information. +dnl Licensed under Apache License v2.0. See the file "LICENSE" for more +dnl information. dnl dnl Fix "mandir" variable... @@ -19,54 +20,10 @@ if test "$mandir" = "\${prefix}/man" -a "$prefix" = "/"; then darwin* | linux* | gnu* | *bsd*) # Darwin, macOS, Linux, GNU HURD, and *BSD mandir="/usr/share/man" - AMANDIR="/usr/share/man" - PMANDIR="/usr/share/man" ;; *) # All others mandir="/usr/man" - AMANDIR="/usr/man" - PMANDIR="/usr/man" ;; esac -else - AMANDIR="$mandir" - PMANDIR="$mandir" fi - -AC_SUBST(AMANDIR) -AC_SUBST(PMANDIR) - -dnl Setup manpage extensions... -case "$host_os_name" in - sunos*) - # Solaris - MAN1EXT=1 - MAN5EXT=5 - MAN7EXT=7 - MAN8EXT=1m - MAN8DIR=1m - ;; - linux* | gnu* | darwin*) - # Linux, GNU Hurd, and macOS - MAN1EXT=1.gz - MAN5EXT=5.gz - MAN7EXT=7.gz - MAN8EXT=8.gz - MAN8DIR=8 - ;; - *) - # All others - MAN1EXT=1 - MAN5EXT=5 - MAN7EXT=7 - MAN8EXT=8 - MAN8DIR=8 - ;; -esac - -AC_SUBST(MAN1EXT) -AC_SUBST(MAN5EXT) -AC_SUBST(MAN7EXT) -AC_SUBST(MAN8EXT) -AC_SUBST(MAN8DIR) |