# HG changeset patch # User Stacy Yeh # Date 1432668066 25200 # Node ID 2ecf8ab90281c32a975b12300f0c51500660b737 # Parent a7b52cbf176b43fd81abdf2a1e3b9f48d308cce0 21029190 'gmake configure' in hplip fails diff -r a7b52cbf176b -r 2ecf8ab90281 components/hplip/Makefile --- a/components/hplip/Makefile Mon May 25 23:01:11 2015 -0700 +++ b/components/hplip/Makefile Tue May 26 12:21:06 2015 -0700 @@ -70,21 +70,21 @@ # and for the HPIJS only support # use these options for the CUPS/SANE support -$(HPLIP_VARIANT)/.built: CONFIGURE_OPTIONS += --with-hpppddir=/usr/share/cups/model/SUNWhplip -$(HPLIP_VARIANT)/.built: CONFIGURE_OPTIONS += --enable-libusb01_build -$(HPLIP_VARIANT)/.built: CONFIGURE_OPTIONS += --enable-fax-build -$(HPLIP_VARIANT)/.built: CONFIGURE_OPTIONS += --enable-hpcups-install -$(HPLIP_VARIANT)/.built: CONFIGURE_OPTIONS += --disable-new-hpcups -$(HPLIP_VARIANT)/.built: CONFIGURE_OPTIONS += --enable-cups-drv-install +$(HPLIP_VARIANT)/.configured: CONFIGURE_OPTIONS += --with-hpppddir=/usr/share/cups/model/SUNWhplip +$(HPLIP_VARIANT)/.configured: CONFIGURE_OPTIONS += --enable-libusb01_build +$(HPLIP_VARIANT)/.configured: CONFIGURE_OPTIONS += --enable-fax-build +$(HPLIP_VARIANT)/.configured: CONFIGURE_OPTIONS += --enable-hpcups-install +$(HPLIP_VARIANT)/.configured: CONFIGURE_OPTIONS += --disable-new-hpcups +$(HPLIP_VARIANT)/.configured: CONFIGURE_OPTIONS += --enable-cups-drv-install # use these options for the HPIJS only support -$(HPIJS_VARIANT)/.built: CONFIGURE_OPTIONS += --enable-foomatic-ppd-install -$(HPIJS_VARIANT)/.built: CONFIGURE_OPTIONS += --with-hpppddir=/usr/share/ppd/SUNWhpijs/HP -$(HPIJS_VARIANT)/.built: CONFIGURE_OPTIONS += --disable-cups-drv-install -$(HPIJS_VARIANT)/.built: CONFIGURE_OPTIONS += --disable-hpcups-install -$(HPIJS_VARIANT)/.built: CONFIGURE_OPTIONS += --disable-doc-build -$(HPIJS_VARIANT)/.built: CONFIGURE_OPTIONS += --enable-hpijs-only-build -$(HPIJS_VARIANT)/.built: CONFIGURE_OPTIONS += --enable-hpijs-install +$(HPIJS_VARIANT)/.configured: CONFIGURE_OPTIONS += --enable-foomatic-ppd-install +$(HPIJS_VARIANT)/.configured: CONFIGURE_OPTIONS += --with-hpppddir=/usr/share/ppd/SUNWhpijs/HP +$(HPIJS_VARIANT)/.configured: CONFIGURE_OPTIONS += --disable-cups-drv-install +$(HPIJS_VARIANT)/.configured: CONFIGURE_OPTIONS += --disable-hpcups-install +$(HPIJS_VARIANT)/.configured: CONFIGURE_OPTIONS += --disable-doc-build +$(HPIJS_VARIANT)/.configured: CONFIGURE_OPTIONS += --enable-hpijs-only-build +$(HPIJS_VARIANT)/.configured: CONFIGURE_OPTIONS += --enable-hpijs-install install: COMPONENT_INSTALL_ENV += halpredir=/etc/hal/fdi/preprobe/10osvendor