On 06/22/2011 10:38 AM, Daniel P. Berrange wrote:
The @FOO@ notation in virt-xml-validate.in is pretty idiomatic, so instead of changing to ::FOO::, why don't we instead change tools/Makefile.am to not fall foul of the syntax check rule in the first place, with a well-placed regex bracket sequence?
Yep, that works for me
Smaller patches are always nicer :)
virt-xml-validate: virt-xml-validate.in Makefile - $(AM_V_GEN)sed -e 's,@SCHEMADIR@,$(pkgdatadir)/schemas,' < $< > $@ \ + $(AM_V_GEN)sed -e 's,[@]SCHEMADIR@,$(pkgdatadir)/schemas,' < $< > $@ \ || (rm $@ && exit 1) && chmod +x $@
ACK
Pushed with this commit message: commit 50a6a1267ad45f4af1c872744777ba5a4b03d29e Author: Eric Blake <eblake@redhat.com> Date: Wed Jun 22 10:40:24 2011 -0600 maint: remove syntax-check exception We weren't using the @FOO@ notation for a Makefile substitution, but instead for a sed rule, so using [@]FOO@ instead avoids the need to exempt this syntax check. * cfg.mk (_makefile_at_at_check_exceptions): Delete. * tools/Makefile.am (virt-xml-validate, virt-pki-validate): Avoid tripping syntax-check. Reported by Daniel P. Berrange. -- Eric Blake eblake@redhat.com +1-801-349-2682 Libvirt virtualization library http://libvirt.org