Mitch Harder
c1a1febf7c
Adding a patch to support libusb and kernel usblp at the same time. http://www.cups.org/str.php?L3357 The current Gentoo net-print/cups-1.4.6-r1 will fail if the kernel is compiled with CONFIG_USB_PRINTER (either built-in or module, see http://bugs.gentoo.org/show_bug.cgi?id=365627). I have changed this error to a warning. However, the warning may not be necessary with the patch applied. Both Ubuntu and Debian have adopted this patch (other distros have probably done likewise). Please note: This Sabayon version of net-print/cups can be obsoleted if/when the version in the main Gentoo tree adopts the patch (I am pursuing pushing this patch back).
22 lines
679 B
Diff
22 lines
679 B
Diff
# Source: Gentoo
|
|
|
|
diff -urN cups-1.4.4/scripting/php/Makefile cups-1.4.4.new//scripting/php/Makefile
|
|
--- cups-1.4.4/scripting/php/Makefile 2008-08-27 23:12:43.000000000 +0200
|
|
+++ cups-1.4.4.new//scripting/php/Makefile 2010-08-13 10:32:35.764063909 +0200
|
|
@@ -95,11 +95,11 @@
|
|
|
|
install-exec:
|
|
echo Installing $(PHPCUPS) in $(PHPDIR)
|
|
- $(INSTALL_DIR) $(PHPDIR)
|
|
- $(INSTALL_LIB) $(PHPCUPS) $(PHPDIR)
|
|
+ $(INSTALL_DIR) $(DESTDIR)/$(PHPDIR)
|
|
+ $(INSTALL_LIB) $(PHPCUPS) $(DESTDIR)/$(PHPDIR)
|
|
if test "x$(SYMROOT)" != x; then \
|
|
- $(INSTALL_DIR) $(SYMROOT); \
|
|
- cp $(PHPCUPS) $(SYMROOT); \
|
|
+ $(INSTALL_DIR) $(DESTDIR)/$(SYMROOT); \
|
|
+ cp $(PHPCUPS) $(DESTDIR)/$(SYMROOT); \
|
|
fi
|
|
|
|
|