On 31.08.2015 18:11, Guido Günther wrote:
On Mon, Aug 31, 2015 at 05:22:23PM +0200, Martin Kletzander wrote:
> On Thu, Aug 20, 2015 at 10:50:54AM +0200, Guido Günther wrote:
>> On Thu, Aug 20, 2015 at 03:12:36AM +0200, Michal Privoznik wrote:
>>> On 19.08.2015 14:40, Guido Günther wrote:
>>>> We're using the %.html.tmp for all html files now so drop the unused
one
>>>> and rather make sure the needed directory exists.
>>>>
>>>> This fixes build failures as described in
>>>>
>>>>
https://www.redhat.com/archives/libvir-list/2015-August/msg00603.html
>>>> ---
>
> I'm glad it fixed your problem, but now it doesn't build on old
> autoconf/automake. And it also generates the pages using different
> schema. What was the issue for you (why you originally needed this
> patch)? Couldn't that be fixed differently and this one reverted?
I had some off list discussion about Centos 5 and it seems the MKDIR_P
in configure.ac just isn't expanded correctly, that could be worked
around, I guess.
The reason I proposed this change was that from 1.2.17 on the build
failed with:
make[4]: Entering directory '/tmp/buildd/libvirt-1.2.17~rc1/debian/build/docs'
missing XHTML1 DTD
cat: internals/locking.html.tmp: No such file or directory
Makefile:2385: recipe for target 'internals/locking.html' failed
make[4]: *** [internals/locking.html] Error 1
that was caused by locking.html.tmp using the %.html.tmp: instead of the
internals/%.html.tmp: rule.
So the rule removal was more of a cleanup. Creating the directory via
configure.ac was already sufficient to "fix" the problem.
Guido, I think the original problem you're seeing is just an ordering
problem. If you revert you patch, and apply this one:
diff --git a/docs/Makefile.am b/docs/Makefile.am
index 563baca..529f695 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -162,7 +162,7 @@ EXTRA_DIST= \
sitemap.html.in aclperms.htmlinc \
todo.pl hvsupport.pl todo.cfg-example
-acl_generated = aclperms.htmlinc
+acl_generated = $(srcdir)/aclperms.htmlinc
$(srcdir)/aclperms.htmlinc: $(top_srcdir)/src/access/viraccessperm.h \
$(srcdir)/genaclperms.pl Makefile.am
@@ -174,7 +174,7 @@ MAINTAINERCLEANFILES = \
$(addprefix $(srcdir)/,$(devhelphtml)) \
$(addprefix $(srcdir)/,$(internals_html)) \
$(addprefix $(srcdir)/,$(dot_php)) \
- $(srcdir)/hvsupport.html.in $(srcdir)/aclperms.htmlinc
+ $(srcdir)/hvsupport.html.in $(acl_generated)
all-am: web
are you able to build libvirt on debian? Can you test it please?
Michal