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