--- a/components/cups/Makefile Mon Nov 16 06:14:40 2015 -0800
+++ b/components/cups/Makefile Mon Nov 23 15:33:43 2015 -0800
@@ -45,8 +45,11 @@
# don't use LD_Z_IGNORE: causes linker problems
LD_Z_IGNORE=
-CONFIGURE_OPTIONS += --prefix=/usr
-CONFIGURE_OPTIONS += --mandir=/usr/share/man
+# cups has an unusual hybrid-build system to support 32-bit and 64-bit
+# libraries in a single build; avoid confusing it by omitting default configure
+# CPPFLAGS.
+CONFIGURE_CPPFLAGS=
+
CONFIGURE_OPTIONS += --localedir=$(USRSHARELOCALEDIR)
CONFIGURE_OPTIONS += --sysconfdir=$(ETCDIR)
CONFIGURE_OPTIONS += --localstatedir=/var