86417dca4e
git-svn-id: svn://svn.openwrt.org/openwrt/packages@15455 3c298f89-4303-0410-b956-a3cf2f4a3e73
65 lines
1.6 KiB
Diff
65 lines
1.6 KiB
Diff
--- a/cups-config.in
|
|
+++ b/cups-config.in
|
|
@@ -53,7 +53,7 @@ else
|
|
CFLAGS="$CFLAGS -I$includedir"
|
|
fi
|
|
|
|
- if test $libdir != /usr/lib -a $libdir != /usr/lib32 -a $libdir != /usr/lib64; then
|
|
+ if test $libdir != /usr/lib -a $libdir != /usr/lib -a $libdir != /usr/lib; then
|
|
LDFLAGS="$LDFLAGS -L$libdir"
|
|
fi
|
|
fi
|
|
--- a/config-scripts/cups-3264.m4
|
|
+++ b/config-scripts/cups-3264.m4
|
|
@@ -108,7 +108,7 @@ case "$uname" in
|
|
LIB64CUPSIMAGE="64bit/libcupsimage.so.2"
|
|
LIB64DIR="$exec_prefix/lib"
|
|
if test -d /usr/lib64; then
|
|
- LIB64DIR="${LIB64DIR}64"
|
|
+ LIB64DIR="${LIB64DIR}"
|
|
fi
|
|
UNINSTALL64="uninstall64bit"
|
|
fi
|
|
--- a/config-scripts/cups-directories.m4
|
|
+++ b/config-scripts/cups-directories.m4
|
|
@@ -107,7 +107,7 @@ if test "$libdir" = "\${exec_prefix}/lib
|
|
;;
|
|
Linux*)
|
|
if test -d /usr/lib64; then
|
|
- libdir="$exec_prefix/lib64"
|
|
+ libdir="$exec_prefix/lib"
|
|
fi
|
|
;;
|
|
HP-UX*)
|
|
--- a/configure
|
|
+++ b/configure
|
|
@@ -9254,7 +9254,7 @@ if test "$libdir" = "\${exec_prefix}/lib
|
|
;;
|
|
Linux*)
|
|
if test -d /usr/lib64; then
|
|
- libdir="$exec_prefix/lib64"
|
|
+ libdir="$exec_prefix/lib"
|
|
fi
|
|
;;
|
|
HP-UX*)
|
|
@@ -9792,9 +9792,6 @@ case "$uname" in
|
|
LIB32CUPS="32bit/libcups.so.2"
|
|
LIB32CUPSIMAGE="32bit/libcupsimage.so.2"
|
|
LIB32DIR="$exec_prefix/lib"
|
|
- if test -d /usr/lib32; then
|
|
- LIB32DIR="${LIB32DIR}32"
|
|
- fi
|
|
UNINSTALL32="uninstall32bit"
|
|
fi
|
|
|
|
@@ -9804,9 +9801,6 @@ case "$uname" in
|
|
LIB64CUPS="64bit/libcups.so.2"
|
|
LIB64CUPSIMAGE="64bit/libcupsimage.so.2"
|
|
LIB64DIR="$exec_prefix/lib"
|
|
- if test -d /usr/lib64; then
|
|
- LIB64DIR="${LIB64DIR}64"
|
|
- fi
|
|
UNINSTALL64="uninstall64bit"
|
|
fi
|
|
;;
|