cups: fix libdir handling
authorArnout Vandecappelle <arnout@mind.be>
Tue, 10 Jul 2012 11:52:32 +0000 (11:52 +0000)
committerPeter Korsgaard <jacmet@sunsite.dk>
Sun, 4 Nov 2012 11:07:12 +0000 (12:07 +0100)
Cups uses /usr/lib64 if the HOST has it, no matter if it is cross compiling
for a 32bit arch, breaking the build for stuff looking in /usr/lib.

The fix of commit edd2716c didn't work, it would just force /usr/lib64 if
the target is 64 bit.  Instead, force installation in /usr/lib regardless
of the host.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
package/cups/cups.mk

index 226a832fe9be77c20f17cb8994b7da5adf2c9365..3eb83eac9cf7058f3580a5ccee2577b32a1e8b95 100644 (file)
@@ -14,7 +14,7 @@ CUPS_CONF_OPT = --without-perl \
                --without-java \
                --disable-gnutls \
                --disable-gssapi \
-               --libdir=/usr/$(if $(BR2_ARCH_IS_64),lib64,lib)
+               --libdir=/usr/lib
 
 CUPS_DEPENDENCIES = $(if $(BR2_PACKAGE_ZLIB),zlib) \
                    $(if $(BR2_PACKAGE_LIBPNG),libpng) \