mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2025-02-01 17:35:17 +00:00
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.
This commit is contained in:
parent
abb82f53ed
commit
50a6a1267a
3
cfg.mk
3
cfg.mk
@ -581,9 +581,6 @@ _autogen:
|
||||
$(srcdir)/autogen.sh
|
||||
./config.status
|
||||
|
||||
# Exempt @...@ uses of these symbols.
|
||||
_makefile_at_at_check_exceptions = ' && !/(SCHEMA|SYSCONF)DIR/'
|
||||
|
||||
# regenerate HACKING as part of the syntax-check
|
||||
syntax-check: $(top_srcdir)/HACKING
|
||||
|
||||
|
@ -23,14 +23,14 @@ dist_man1_MANS = virt-xml-validate.1 virt-pki-validate.1 virsh.1
|
||||
|
||||
|
||||
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 $@
|
||||
|
||||
virt-xml-validate.1: virt-xml-validate.in
|
||||
$(AM_V_GEN)$(POD2MAN) $< $(srcdir)/$@
|
||||
|
||||
virt-pki-validate: virt-pki-validate.in Makefile
|
||||
$(AM_V_GEN)sed -e 's,@SYSCONFDIR@,$(sysconfdir),' < $< > $@ \
|
||||
$(AM_V_GEN)sed -e 's,[@]SYSCONFDIR@,$(sysconfdir),' < $< > $@ \
|
||||
|| (rm $@ && exit 1) && chmod +x $@
|
||||
|
||||
virt-pki-validate.1: virt-pki-validate.in
|
||||
|
Loading…
x
Reference in New Issue
Block a user