From: Egger Christoph <chegger@amazon.de>
To: xen-devel <xen-devel@lists.xen.org>
Cc: Ian Campbell <Ian.Campbell@citrix.com>
Subject: [PATCH] docs: make 'gmake dist-docs' work
Date: Mon, 22 Apr 2013 13:55:51 +0200 [thread overview]
Message-ID: <51752547.70801@amazon.de> (raw)
[-- Attachment #1: Type: text/plain, Size: 1606 bytes --]
doc: Makefile fixes
- use correct pathes (make gmake dist-docs from toplevel directory work)
- use tools as found by configure (perl)
Signed-off-by: Christoph Egger <chegger@amazon.de>
diff --git a/docs/Makefile b/docs/Makefile
index 5f319a1..d247dea 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -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 @@ clean:
.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 @@ install: all
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 @@ else
@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-ia64 -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
[-- Attachment #2: patch_docs.diff --]
[-- Type: text/plain, Size: 1754 bytes --]
commit eab28e737b01fdbe929a66a6f1c55a3b89bc2fb7
Author: Christoph Egger <chegger@amazon.de>
Date: Thu Apr 4 13:30:30 2013 +0000
doc: Makefile fixes
- use correct pathes (make gmake dist-docs from toplevel directory work)
- use tools as found by configure (perl)
Signed-off-by: Christoph Egger <chegger@amazon.de>
diff --git a/docs/Makefile b/docs/Makefile
index 5f319a1..d247dea 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -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 @@ clean:
.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 @@ install: all
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 @@ else
@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-ia64 -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
[-- 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-04-22 11:55 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-22 11:55 Egger Christoph [this message]
2013-04-24 11:48 ` [PATCH] docs: make 'gmake dist-docs' work Ian Campbell
2013-04-24 12:54 ` Christoph Egger
2013-04-24 13:02 ` Ian Campbell
2013-05-10 12:06 ` Christoph Egger
2013-05-10 14:00 ` Christoph Egger
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=51752547.70801@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.