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?
> configure.ac | 1 + > docs/Makefile.am | 9 --------- > 2 files changed, 1 insertion(+), 9 deletions(-) > > diff --git a/configure.ac b/configure.ac > index 9066ed6..749dbb7 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -2774,6 +2774,7 @@ AC_DEFINE_UNQUOTED([isbase64],[libvirt_gl_isbase64],[Hack to avoid symbol clash] > AC_DEFINE_UNQUOTED([base64_encode],[libvirt_gl_base64_encode],[Hack to avoid symbol clash]) > AC_DEFINE_UNQUOTED([base64_encode_alloc],[libvirt_gl_base64_encode_alloc],[Hack to avoid symbol clash]) > > +AC_CONFIG_COMMANDS([mkdir], [$MKDIR_P docs/internals]) > AC_CONFIG_FILES([run], > [chmod +x,-w run]) > AC_CONFIG_FILES([\ > diff --git a/docs/Makefile.am b/docs/Makefile.am > index daf37b6..563baca 100644 > --- a/docs/Makefile.am > +++ b/docs/Makefile.am > @@ -218,15 +218,6 @@ $(srcdir)/hvsupport.html.in: $(srcdir)/hvsupport.pl $(api_DATA) \ > %.png: %.fig > convert -rotate 90 $< $@ > > -internals/%.html.tmp: internals/%.html.in subsite.xsl page.xsl sitemap.html.in > - @if [ -x $(XSLTPROC) ] ; then \ > - echo "Generating $@"; \ > - $(MKDIR_P) internals; \ > - name=`echo $@ | sed -e 's/.tmp//'`; \ > - $(XSLTPROC) --stringparam pagename $$name --nonet \ > - $(top_srcdir)/docs/subsite.xsl $< > $@ \ > - || { rm $@ && exit 1; }; fi > - > %.html.tmp: %.html.in site.xsl page.xsl sitemap.html.in $(acl_generated) > @if [ -x $(XSLTPROC) ] ; then \ > echo "Generating $@"; \ > ACKPushed. Thanks, -- Guido -- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list
Attachment:
signature.asc
Description: PGP signature
-- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list