cups and others:v.bump

This commit is contained in:
2017-12-15 07:39:59 +03:00
parent 72b184604a
commit ff0944daa5
19 changed files with 222 additions and 399 deletions
@@ -1,6 +1,35 @@
--- cups-config.in~ 2014-01-18 13:56:12.423297761 +0100
+++ cups-config.in 2014-01-18 13:56:59.459964275 +0100
@@ -50,7 +50,7 @@ else
diff -Nuar cups_old-2.2.6/config-scripts/cups-directories.m4 cups-2.2.6/config-scripts/cups-directories.m4
--- cups_old-2.2.6/config-scripts/cups-directories.m4 2017-12-14 06:56:50.708946000 +0300
+++ cups-2.2.6/config-scripts/cups-directories.m4 2017-12-14 09:23:45.490213940 +0300
@@ -101,8 +101,8 @@
if test "$libdir" = "\${exec_prefix}/lib"; then
case "$host_os_name" in
linux*)
- if test -d /usr/lib64 -a ! -d /usr/lib64/fakeroot; then
- libdir="$exec_prefix/lib64"
+ if test -d /usr/lib -a ! -d /usr/lib/fakeroot; then
+ libdir="$exec_prefix/lib"
fi
;;
esac
diff -Nuar cups_old-2.2.6/configure cups-2.2.6/configure
--- cups_old-2.2.6/configure 2017-12-14 06:56:51.766946000 +0300
+++ cups-2.2.6/configure 2017-12-14 09:26:43.667224765 +0300
@@ -6187,8 +6187,8 @@
if test "$libdir" = "\${exec_prefix}/lib"; then
case "$host_os_name" in
linux*)
- if test -d /usr/lib64 -a ! -d /usr/lib64/fakeroot; then
- libdir="$exec_prefix/lib64"
+ if test -d /usr/lib -a ! -d /usr/lib/fakeroot; then
+ libdir="$exec_prefix/lib"
fi
;;
esac
diff -Nuar cups_old-2.2.6/cups-config.in cups-2.2.6/cups-config.in
--- cups_old-2.2.6/cups-config.in 2017-11-01 17:57:53.000000000 +0300
+++ cups-2.2.6/cups-config.in 2017-12-14 09:22:37.641209818 +0300
@@ -48,7 +48,7 @@
CFLAGS="$CFLAGS -I$includedir"
fi
@@ -9,29 +38,3 @@
LDFLAGS="$LDFLAGS -L$libdir"
fi
fi
--- config-scripts/cups-directories.m4~ 2014-01-18 13:56:23.529964393 +0100
+++ config-scripts/cups-directories.m4 2014-01-18 13:57:40.706630807 +0100
@@ -103,8 +103,8 @@ dnl Fix "libdir" variable...
if test "$libdir" = "\${exec_prefix}/lib"; then
case "$uname" in
Linux*)
- if test -d /usr/lib64 -a ! -d /usr/lib64/fakeroot; then
- libdir="$exec_prefix/lib64"
+ if test -d /usr/lib -a ! -d /usr/lib/fakeroot; then
+ libdir="$exec_prefix/lib"
fi
;;
HP-UX*)
--- configure~ 2014-01-18 13:56:32.346631030 +0100
+++ configure 2014-01-18 13:57:12.076630898 +0100
@@ -5893,8 +5893,8 @@ fi
if test "$libdir" = "\${exec_prefix}/lib"; then
case "$uname" in
Linux*)
- if test -d /usr/lib64 -a ! -d /usr/lib64/fakeroot; then
- libdir="$exec_prefix/lib64"
+ if test -d /usr/lib -a ! -d /usr/lib/fakeroot; then
+ libdir="$exec_prefix/lib"
fi
;;
HP-UX*)