]> xenbits.xensource.com Git - people/liuw/libxenctrl-split/libvirt.git/commitdiff
Revert "docs: Drop unused rule for internals/%.html.tmp target"
authorMartin Kletzander <mkletzan@redhat.com>
Wed, 9 Sep 2015 09:45:57 +0000 (11:45 +0200)
committerMartin Kletzander <mkletzan@redhat.com>
Wed, 9 Sep 2015 09:52:24 +0000 (11:52 +0200)
This reverts commit e5470dd0e0a5be02cbf18a882cfc676b39d1c1a5.

This has been ACK'd by the original author in the original mail thread:
https://www.redhat.com/archives/libvir-list/2015-September/msg00310.html

The reason to revert this is due to the patch breaking the generation of
internal subsites.  The original issue still needs to be dealt with,
though.

Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
configure.ac
docs/Makefile.am

index ef7fbdbed32ce0e8853f8741dbf67bce240c5051..03463b048c3cc1ed2b42e58cd2e28b7f34ed8c5d 100644 (file)
@@ -2777,7 +2777,6 @@ 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([\
index 263daae448ca3348c6e7b04ff712aa0904236bee..bfae35e0ddbadebae7788ffa23a0b796c4aa78ec 100644 (file)
@@ -218,6 +218,15 @@ $(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 $@"; \