From: florian Date: Fri, 18 Jan 2013 16:34:37 +0000 (+0000) Subject: cups: fix cups build against libusb/libusb-1.0 X-Git-Url: http://207.154.207.93/?a=commitdiff_plain;h=abe2078325e3ab721bc0cb356b22555d3846faa1;p=packages.git 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 Signed-off-by: Florian Fainelli 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 ec2fdd51d..d5a85d937 100644 --- 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