diff options
Diffstat (limited to 'config-scripts/cups-directories.m4')
| -rw-r--r-- | config-scripts/cups-directories.m4 | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/config-scripts/cups-directories.m4 b/config-scripts/cups-directories.m4 index 2ba017403..78d2f8f36 100644 --- a/config-scripts/cups-directories.m4 +++ b/config-scripts/cups-directories.m4 @@ -1,7 +1,7 @@ dnl dnl Directory stuff for CUPS. dnl -dnl Copyright 2007-2016 by Apple Inc. +dnl Copyright 2007-2017 by Apple Inc. dnl Copyright 1997-2007 by Easy Software Products, all rights reserved. dnl dnl These coded instructions, statements, and computer programs are the @@ -74,7 +74,7 @@ fi dnl Fix "localstatedir" variable if it hasn't been specified... if test "$localstatedir" = "\${prefix}/var"; then if test "$prefix" = "/"; then - if test "$uname" = Darwin; then + if test "$host_os_name" = darwin; then localstatedir="/private/var" else localstatedir="/var" @@ -87,7 +87,7 @@ fi dnl Fix "sysconfdir" variable if it hasn't been specified... if test "$sysconfdir" = "\${prefix}/etc"; then if test "$prefix" = "/"; then - if test "$uname" = Darwin; then + if test "$host_os_name" = darwin; then sysconfdir="/private/etc" else sysconfdir="/etc" @@ -99,8 +99,8 @@ fi dnl Fix "libdir" variable... if test "$libdir" = "\${exec_prefix}/lib"; then - case "$uname" in - Linux*) + case "$host_os_name" in + linux*) if test -d /usr/lib64 -a ! -d /usr/lib64/fakeroot; then libdir="$exec_prefix/lib64" fi @@ -165,7 +165,7 @@ dnl Setup default locations... AC_ARG_WITH(cachedir, [ --with-cachedir set path for cache files],cachedir="$withval",cachedir="") if test x$cachedir = x; then - if test "x$uname" = xDarwin; then + if test "x$host_os_name" = xdarwin; then CUPS_CACHEDIR="$localstatedir/spool/cups/cache" else CUPS_CACHEDIR="$localstatedir/cache/cups" @@ -230,8 +230,8 @@ AC_DEFINE_UNQUOTED(CUPS_FONTPATH, "$CUPS_FONTPATH") # Locale data if test "$localedir" = "\${datarootdir}/locale"; then - case "$uname" in - Linux | GNU | *BSD* | Darwin*) + case "$host_os_name" in + linux | gnu | *bsd* | darwin*) CUPS_LOCALEDIR="$datarootdir/locale" ;; @@ -265,8 +265,8 @@ AC_DEFINE_UNQUOTED(CUPS_REQUESTS, "$localstatedir/spool/cups") AC_SUBST(CUPS_REQUESTS) # Server executables... -case "$uname" in - *BSD* | Darwin*) +case "$host_os_name" in + *bsd* | darwin*) # *BSD and Darwin (macOS) INSTALL_SYSV="" CUPS_SERVERBIN="$exec_prefix/libexec/cups" @@ -289,8 +289,8 @@ AC_SUBST(CUPS_SERVERROOT) # Transient run-time state AC_ARG_WITH(rundir, [ --with-rundir set transient run-time state directory],CUPS_STATEDIR="$withval",[ - case "$uname" in - Darwin*) + case "$host_os_name" in + darwin*) # Darwin (macOS) CUPS_STATEDIR="$CUPS_SERVERROOT" ;; |