net/cups/patches/150-64bit_host_fix.patch

   1 --- a/cups-config.in
   2 +++ b/cups-config.in
   3 @@ -53,7 +53,7 @@ else
   4         CFLAGS="$CFLAGS -I$includedir"
   5      fi
   6
   7 -    if test $libdir != /usr/lib -a $libdir != /usr/lib32 -a $libdir != /usr/lib64; then
   8 +    if test $libdir != /usr/lib -a $libdir != /usr/lib -a $libdir != /usr/lib; then
   9         LDFLAGS="$LDFLAGS -L$libdir"
  10      fi
  11  fi
  12 --- a/config-scripts/cups-3264.m4
  13 +++ b/config-scripts/cups-3264.m4
  14 @@ -108,7 +108,7 @@ case "$uname" in
  15                         LIB64CUPSIMAGE="64bit/libcupsimage.so.2"
  16                         LIB64DIR="$exec_prefix/lib"
  17                         if test -d /usr/lib64; then
  18 -                               LIB64DIR="${LIB64DIR}64"
  19 +                               LIB64DIR="${LIB64DIR}"
  20                         fi
  21                         UNINSTALL64="uninstall64bit"
  22                 fi
  23 --- a/config-scripts/cups-directories.m4
  24 +++ b/config-scripts/cups-directories.m4
  25 @@ -107,7 +107,7 @@ if test "$libdir" = "\${exec_prefix}/lib
  26                         ;;
  27                 Linux*)
  28                         if test -d /usr/lib64; then
  29 -                               libdir="$exec_prefix/lib64"
  30 +                               libdir="$exec_prefix/lib"
  31                         fi
  32                         ;;
  33                 HP-UX*)
  34 --- a/configure
  35 +++ b/configure
  36 @@ -9254,7 +9254,7 @@ if test "$libdir" = "\${exec_prefix}/lib
  37                         ;;
  38                 Linux*)
  39                         if test -d /usr/lib64; then
  40 -                               libdir="$exec_prefix/lib64"
  41 +                               libdir="$exec_prefix/lib"
  42                         fi
  43                         ;;
  44                 HP-UX*)
  45 @@ -9792,9 +9792,6 @@ case "$uname" in
  46                         LIB32CUPS="32bit/libcups.so.2"
  47                         LIB32CUPSIMAGE="32bit/libcupsimage.so.2"
  48                         LIB32DIR="$exec_prefix/lib"
  49 -                       if test -d /usr/lib32; then
  50 -                               LIB32DIR="${LIB32DIR}32"
  51 -                       fi
  52                         UNINSTALL32="uninstall32bit"
  53                 fi
  54
  55 @@ -9804,9 +9801,6 @@ case "$uname" in
  56                         LIB64CUPS="64bit/libcups.so.2"
  57                         LIB64CUPSIMAGE="64bit/libcupsimage.so.2"
  58                         LIB64DIR="$exec_prefix/lib"
  59 -                       if test -d /usr/lib64; then
  60 -                               LIB64DIR="${LIB64DIR}64"
  61 -                       fi
  62                         UNINSTALL64="uninstall64bit"
  63                 fi
  64                 ;;