commit eb546e504e720bd97258a70ef96e4e51e5778009 Author: Marek 'marx' Grac Date: Wed Oct 30 14:24:24 2013 +0100 [build] updates in build system to properly work with metadata.rng Minor updates were required to build a package without this patch you can do ./autogen.sh; ./configure; make - but not a build package process diff --git a/fence/agents/lib/Makefile.am b/fence/agents/lib/Makefile.am index f2fbb09..4cf4b9f 100644 --- a/fence/agents/lib/Makefile.am +++ b/fence/agents/lib/Makefile.am @@ -6,11 +6,11 @@ if BUILD_XENAPILIB TARGET += XenAPI.py endif -SRC = fencing.py.py fencing_snmp.py.py XenAPI.py.py +SRC = fencing.py.py fencing_snmp.py.py XenAPI.py.py check_used_options.py XSL = fence2man.xsl fence2rng.xsl -FASRNG = fence.rng.head fence.rng.tail +FASRNG = fence.rng.head fence.rng.tail metadata.rng EXTRA_DIST = $(SRC) $(XSL) $(FASRNG) diff --git a/make/fencebuild.mk b/make/fencebuild.mk index d775e92..15a47fd 100644 --- a/make/fencebuild.mk +++ b/make/fencebuild.mk @@ -1,8 +1,4 @@ $(TARGET): $(SRC) - if [ 0 -eq `echo "$(SRC)" | grep fence_ &> /dev/null; echo $$?` ]; then \ - PYTHONPATH=$(abs_srcdir)/../lib:$(abs_builddir)/../lib $(top_srcdir)/fence/agents/lib/check_used_options.py $(SRC); \ - else true ; fi - bash $(top_srcdir)/scripts/fenceparse \ $(top_srcdir)/make/copyright.cf REDHAT_COPYRIGHT \ $(VERSION) \ @@ -14,3 +10,7 @@ $(TARGET): $(SRC) -e 's#@''SBINDIR@#${sbindir}#g' \ -e 's#@''LIBEXECDIR@#${libexecdir}#g' \ > $@ + + if [ 0 -eq `echo "$(SRC)" | grep fence_ &> /dev/null; echo $$?` ]; then \ + PYTHONPATH=$(abs_srcdir)/../lib:$(abs_builddir)/../lib $(top_srcdir)/fence/agents/lib/check_used_options.py $@; \ + else true ; fi diff --git a/make/fenceman.mk b/make/fenceman.mk index d4f3b4e..d4f0377 100644 --- a/make/fenceman.mk +++ b/make/fenceman.mk @@ -2,7 +2,7 @@ set -e && \ PYTHONPATH=$(abs_srcdir)/../lib:$(abs_builddir)/../lib \ python $^ -o metadata > .$@.tmp && \ - xmllint --noout --relaxng $(top_srcdir)/fence/agents/lib/metadata.rng .$@.tmp && \ + xmllint --noout --relaxng $(abs_srcdir)/../lib/metadata.rng .$@.tmp && \ xsltproc $(top_srcdir)/fence/agents/lib/fence2man.xsl .$@.tmp > $@ clean-man: