cups: fix cups build against libusb/libusb-1.0

cups was getting confused between libusb and libusb-1.0, the dependency
said libusb, but a configure script was seeing libusb-1.0 available and
preferred it, but then failed during link.  Also, an install target had
some line wrapping problems.

Signed-off-by: Russell Senior <russell@personaltelco.net>
Signed-off-by: Florian Fainelli <florian@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/packages@35236 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/net/cups/Makefile b/net/cups/Makefile
index ec2fdd5..d5a85d9 100644 (file)
--- a/net/cups/Makefile
+++ b/net/cups/Makefile
@@ -31,7 +31,7 @@ define Package/cups
 $(call Package/cups/Default)
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:=+libcups +libcupsmime +libcupscgi +libcupsppdc +libusb
+  DEPENDS:=+libcups +libcupsmime +libcupscgi +libcupsppdc +libusb-1.0
   TITLE:=Common UNIX Printing System (daemon)
 endef
 
@@ -483,9 +483,7 @@ define Package/cups-client/install
                $(PKG_INSTALL_DIR)/usr/sbin/{cupsaccept,cupsaddsmb,cupsfilter} \
                $(PKG_INSTALL_DIR)/usr/sbin/{lpadmin,lpinfo,lpmove} \
                $(1)/usr/sbin/
-       (cd $(1)/usr/sbin; ln -sf cupsaccept accept;
-               ln -sf cupsaccept cupsenable; ln -sf cupsaccept cupsdisable;
-               ln -sf cupsaccept reject; ln -sf cupsaccept cupsreject;)
+       (cd $(1)/usr/sbin; ln -sf cupsaccept accept; ln -sf cupsaccept cupsenable; ln -sf cupsaccept cupsdisable; ln -sf cupsaccept reject; ln -sf cupsaccept cupsreject;)
 endef
 
 define Package/cups-filters/install