23743965 hal-cups-utils should use automake 1.11
authorNorm Jacobs <Norm.Jacobs@Oracle.COM>
Tue, 05 Jul 2016 09:31:58 -0500
changeset 6922 499ba999c1ee
parent 6921 8e1aa475ac41
child 6923 338aea22bf22
23743965 hal-cups-utils should use automake 1.11
components/hal-cups-utils/Makefile
--- a/components/hal-cups-utils/Makefile	Tue Jul 05 09:18:36 2016 -0500
+++ b/components/hal-cups-utils/Makefile	Tue Jul 05 09:31:58 2016 -0500
@@ -51,7 +51,7 @@
 # used by hal-cups-utils maintainer
 COMPONENT_PREP_ACTION = ( \
 	cd $(@D); \
-	ACLOCAL=$(ACLOCAL) AUTOMAKE=$(AUTOMAKE) autoreconf; \
+	ACLOCAL=aclocal-1.11 AUTOMAKE=aclocal-1.11 autoreconf; \
 	cd $(SOURCE_DIR); \
 	$(PERL) -pi -e 's,^\#!.*?python,\#!$(USED_PYTHON), if $$.==1' systemv/hal_lpadmin ; \
 ) 
@@ -59,6 +59,7 @@
 # ASLR disabled until sufficient testing can be performed.
 ASLR_MODE= $(ASLR_DISABLE)
 
+REQUIRED_PACKAGES += developer/build/automake-111
 REQUIRED_PACKAGES += library/print/cups-libs
 REQUIRED_PACKAGES += print/cups
 REQUIRED_PACKAGES += system/hal