# HG changeset patch # User Stacy Yeh # Date 1431377063 25200 # Node ID 7552f305c5fbbdb6bcbd0c94273794561437db23 # Parent d723f8ed85fed87e8b1af3da0d932283ba921292 21029190 'gmake configure' in hplip fails diff -r d723f8ed85fe -r 7552f305c5fb components/hplip/Makefile --- a/components/hplip/Makefile Sun May 10 11:59:46 2015 -0700 +++ b/components/hplip/Makefile Mon May 11 13:44:23 2015 -0700 @@ -69,21 +69,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