From: Christoph Egger <chegger@amazon.de>
To: xen-devel <xen-devel@lists.xen.org>,
Ian Campbell <Ian.Campbell@citrix.com>
Subject: [PATCH v2] docs: make 'gmake dist-docs' work
Date: Fri, 10 May 2013 16:07:44 +0200 [thread overview]
Message-ID: <518CFF30.8070402@amazon.de> (raw)
[-- Attachment #1: Type: text/plain, Size: 2553 bytes --]
doc: buildsystem fixes
- use correct pathes (make gmake dist-docs from toplevel directory work)
- configure detects perl as tools/configure does
Signed-off-by: Christoph Egger <chegger@amazon.de>
Reviewed-by: Matthew Wilson <msw@amazon.de>
diff -r f1ed2ada40b8 -r fe9b7562b2c8 config/Docs.mk.in
--- a/config/Docs.mk.in Tue Mar 12 14:19:36 2013 +0000
+++ b/config/Docs.mk.in Fri May 10 13:44:43 2013 +0000
@@ -11,3 +11,4 @@
POD2HTML := @POD2HTML@
POD2TEXT := @POD2TEXT@
MARKDOWN := @MARKDOWN@
+PERL := @PERL@
diff -r f1ed2ada40b8 -r fe9b7562b2c8 docs/Makefile
--- a/docs/Makefile Tue Mar 12 14:19:36 2013 +0000
+++ b/docs/Makefile Fri May 10 13:44:43 2013 +0000
@@ -1,5 +1,3 @@
-#!/usr/bin/make -f
-
XEN_ROOT=$(CURDIR)/..
include $(XEN_ROOT)/Config.mk
-include $(XEN_ROOT)/config/Docs.mk
@@ -75,7 +73,7 @@
.PHONY: distclean
distclean: clean
- rm -rf ../config/Docs.mk config.log config.status config.cache \
+ rm -rf $(XEN_ROOT)/config/Docs.mk config.log config.status config.cache \
autom4te.cache
.PHONY: install
@@ -88,8 +86,8 @@
cp -R man5 $(DESTDIR)$(MANDIR)
[ ! -d html ] || cp -R html $(DESTDIR)$(DOCDIR)
-html/index.html: $(DOC_HTML) ./gen-html-index INDEX
- perl -w -- ./gen-html-index -i INDEX html $(DOC_HTML)
+html/index.html: $(DOC_HTML) $(CURDIR)/gen-html-index INDEX
+ $(PERL) -w -- $(CURDIR)/gen-html-index -i INDEX html $(DOC_HTML)
html/%.html: %.markdown
$(INSTALL_DIR) $(@D)
@@ -123,13 +121,13 @@
@echo "pod2html not installed; skipping $<."
endif
-html/hypercall/index.html: ./xen-headers
+html/hypercall/index.html: $(CURDIR)/xen-headers
rm -rf $(@D)
$(INSTALL_DIR) $(@D)
- ./xen-headers -O $(@D) \
+ $(PERL) -w $(CURDIR)/xen-headers -O $(@D) \
-T 'arch-x86_64 - Xen public headers' \
-X arch-x86_32 -X xen-x86_32 -X arch-arm \
- ../xen include/public include/xen/errno.h
+ $(XEN_ROOT)/xen include/public include/xen/errno.h
-include html/hypercall/.deps
diff -r f1ed2ada40b8 -r fe9b7562b2c8 docs/configure.ac
--- a/docs/configure.ac Tue Mar 12 14:19:36 2013 +0000
+++ b/docs/configure.ac Fri May 10 13:44:43 2013 +0000
@@ -10,6 +10,7 @@
# M4 Macro includes
m4_include([../m4/docs_tool.m4])
+m4_include([../m4/path_or_fail.m4])
AX_DOCS_TOOL_PROG([FIG2DEV], [fig2dev])
AX_DOCS_TOOL_PROG([POD2MAN], [pod2man])
@@ -17,4 +18,7 @@
AX_DOCS_TOOL_PROG([POD2TEXT], [pod2text])
AX_DOCS_TOOL_PROGS([MARKDOWN], [markdown], [markdown markdown_py])
+AC_ARG_VAR([PERL], [Path to Perl parser])
+AX_PATH_PROG_OR_FAIL([PERL], [perl])
+
AC_OUTPUT()
[-- Attachment #2: patch_docs.diff --]
[-- Type: text/plain, Size: 2563 bytes --]
doc: buildsystem fixes
- use correct pathes (make gmake dist-docs from toplevel directory work)
- configure detects perl as tools/configure does
Signed-off-by: Christoph Egger <chegger@amazon.de>
Reviewed-by: Matthew Wilson <msw@amazon.de>
diff -r f1ed2ada40b8 -r fe9b7562b2c8 config/Docs.mk.in
--- a/config/Docs.mk.in Tue Mar 12 14:19:36 2013 +0000
+++ b/config/Docs.mk.in Fri May 10 13:44:43 2013 +0000
@@ -11,3 +11,4 @@
POD2HTML := @POD2HTML@
POD2TEXT := @POD2TEXT@
MARKDOWN := @MARKDOWN@
+PERL := @PERL@
diff -r f1ed2ada40b8 -r fe9b7562b2c8 docs/Makefile
--- a/docs/Makefile Tue Mar 12 14:19:36 2013 +0000
+++ b/docs/Makefile Fri May 10 13:44:43 2013 +0000
@@ -1,5 +1,3 @@
-#!/usr/bin/make -f
-
XEN_ROOT=$(CURDIR)/..
include $(XEN_ROOT)/Config.mk
-include $(XEN_ROOT)/config/Docs.mk
@@ -75,7 +73,7 @@
.PHONY: distclean
distclean: clean
- rm -rf ../config/Docs.mk config.log config.status config.cache \
+ rm -rf $(XEN_ROOT)/config/Docs.mk config.log config.status config.cache \
autom4te.cache
.PHONY: install
@@ -88,8 +86,8 @@
cp -R man5 $(DESTDIR)$(MANDIR)
[ ! -d html ] || cp -R html $(DESTDIR)$(DOCDIR)
-html/index.html: $(DOC_HTML) ./gen-html-index INDEX
- perl -w -- ./gen-html-index -i INDEX html $(DOC_HTML)
+html/index.html: $(DOC_HTML) $(CURDIR)/gen-html-index INDEX
+ $(PERL) -w -- $(CURDIR)/gen-html-index -i INDEX html $(DOC_HTML)
html/%.html: %.markdown
$(INSTALL_DIR) $(@D)
@@ -123,13 +121,13 @@
@echo "pod2html not installed; skipping $<."
endif
-html/hypercall/index.html: ./xen-headers
+html/hypercall/index.html: $(CURDIR)/xen-headers
rm -rf $(@D)
$(INSTALL_DIR) $(@D)
- ./xen-headers -O $(@D) \
+ $(PERL) -w $(CURDIR)/xen-headers -O $(@D) \
-T 'arch-x86_64 - Xen public headers' \
-X arch-x86_32 -X xen-x86_32 -X arch-arm \
- ../xen include/public include/xen/errno.h
+ $(XEN_ROOT)/xen include/public include/xen/errno.h
-include html/hypercall/.deps
diff -r f1ed2ada40b8 -r fe9b7562b2c8 docs/configure.ac
--- a/docs/configure.ac Tue Mar 12 14:19:36 2013 +0000
+++ b/docs/configure.ac Fri May 10 13:44:43 2013 +0000
@@ -10,6 +10,7 @@
# M4 Macro includes
m4_include([../m4/docs_tool.m4])
+m4_include([../m4/path_or_fail.m4])
AX_DOCS_TOOL_PROG([FIG2DEV], [fig2dev])
AX_DOCS_TOOL_PROG([POD2MAN], [pod2man])
@@ -17,4 +18,7 @@
AX_DOCS_TOOL_PROG([POD2TEXT], [pod2text])
AX_DOCS_TOOL_PROGS([MARKDOWN], [markdown], [markdown markdown_py])
+AC_ARG_VAR([PERL], [Path to Perl parser])
+AX_PATH_PROG_OR_FAIL([PERL], [perl])
+
AC_OUTPUT()
[-- Attachment #3: Type: text/plain, Size: 126 bytes --]
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
next reply other threads:[~2013-05-10 14:07 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-10 14:07 Christoph Egger [this message]
2013-05-13 10:44 ` [PATCH v2] docs: make 'gmake dist-docs' work Ian Campbell
2013-05-13 11:25 ` Christoph Egger
2013-05-13 11:34 ` Ian Campbell
2013-05-13 12:11 ` Christoph Egger
2013-05-13 12:23 ` Ian Campbell
2013-05-13 12:59 ` Christoph Egger
2013-05-13 12:30 ` Tim Deegan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=518CFF30.8070402@amazon.de \
--to=chegger@amazon.de \
--cc=Ian.Campbell@citrix.com \
--cc=xen-devel@lists.xen.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.