* [PATCH] libtraceevent: install html files
@ 2020-10-18 21:19 Sudip Mukherjee
2020-10-19 13:42 ` Steven Rostedt
0 siblings, 1 reply; 4+ messages in thread
From: Sudip Mukherjee @ 2020-10-18 21:19 UTC (permalink / raw)
To: Steven Rostedt, acme; +Cc: linux-kernel, linux-trace-devel, Sudip Mukherjee
Only the man pages were installed using "make install". Add rules to
install html files also.
Signed-off-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
---
tools/lib/traceevent/Documentation/Makefile | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/tools/lib/traceevent/Documentation/Makefile b/tools/lib/traceevent/Documentation/Makefile
index aa72ab96c3c1..dd3d62b17140 100644
--- a/tools/lib/traceevent/Documentation/Makefile
+++ b/tools/lib/traceevent/Documentation/Makefile
@@ -147,7 +147,7 @@ html: $(MAN_HTML)
$(MAN_HTML) $(DOC_MAN3): asciidoc.conf
-install: install-man
+install: install-man install-html
check-man-tools:
ifdef missing_tools
@@ -161,12 +161,22 @@ do-install-man: man
install-man: check-man-tools man do-install-man
-uninstall: uninstall-man
+do-install-html: html
+ $(call QUIET_INSTALL, Documentation-html) \
+ $(INSTALL) -d -m 755 $(DESTDIR)$(htmldir); \
+ $(INSTALL) -m 644 $(OUTPUT)*.html $(DESTDIR)$(htmldir);
+
+install-html: check-man-tools html do-install-html
+
+uninstall: uninstall-man uninstall-html
uninstall-man:
$(call QUIET_UNINST, Documentation-man) \
$(Q)$(RM) $(addprefix $(DESTDIR)$(man3dir)/,$(DOC_MAN3))
+uninstall-html:
+ $(call QUIET_UNINST, Documentation-html) \
+ $(Q)$(RM) $(addprefix $(DESTDIR)$(htmldir)/,$(MAN_HTML))
ifdef missing_tools
DO_INSTALL_MAN = $(warning Please install $(missing_tools) to have the man pages installed)
--
2.11.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] libtraceevent: install html files
2020-10-18 21:19 [PATCH] libtraceevent: install html files Sudip Mukherjee
@ 2020-10-19 13:42 ` Steven Rostedt
2020-10-19 18:59 ` Sudip Mukherjee
0 siblings, 1 reply; 4+ messages in thread
From: Steven Rostedt @ 2020-10-19 13:42 UTC (permalink / raw)
To: Sudip Mukherjee; +Cc: acme, linux-kernel, linux-trace-devel
On Sun, 18 Oct 2020 22:19:12 +0100
Sudip Mukherjee <sudipm.mukherjee@gmail.com> wrote:
> Only the man pages were installed using "make install". Add rules to
> install html files also.
>
> Signed-off-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
> ---
> tools/lib/traceevent/Documentation/Makefile | 14 ++++++++++++--
Thanks Sudip,
Although, to apply it to the libtraceevent.git repo, I had to strip off the
"tools/lib/traceevent/" from the file paths.
-- Steve
> 1 file changed, 12 insertions(+), 2 deletions(-)
>
> diff --git a/tools/lib/traceevent/Documentation/Makefile b/tools/lib/traceevent/Documentation/Makefile
> index aa72ab96c3c1..dd3d62b17140 100644
> --- a/tools/lib/traceevent/Documentation/Makefile
> +++ b/tools/lib/traceevent/Documentation/Makefile
> @@ -147,7 +147,7 @@ html: $(MAN_HTML)
>
> $(MAN_HTML) $(DOC_MAN3): asciidoc.conf
>
> -install: install-man
> +install: install-man install-html
>
> check-man-tools:
> ifdef missing_tools
> @@ -161,12 +161,22 @@ do-install-man: man
>
> install-man: check-man-tools man do-install-man
>
> -uninstall: uninstall-man
> +do-install-html: html
> + $(call QUIET_INSTALL, Documentation-html) \
> + $(INSTALL) -d -m 755 $(DESTDIR)$(htmldir); \
> + $(INSTALL) -m 644 $(OUTPUT)*.html $(DESTDIR)$(htmldir);
> +
> +install-html: check-man-tools html do-install-html
> +
> +uninstall: uninstall-man uninstall-html
>
> uninstall-man:
> $(call QUIET_UNINST, Documentation-man) \
> $(Q)$(RM) $(addprefix $(DESTDIR)$(man3dir)/,$(DOC_MAN3))
>
> +uninstall-html:
> + $(call QUIET_UNINST, Documentation-html) \
> + $(Q)$(RM) $(addprefix $(DESTDIR)$(htmldir)/,$(MAN_HTML))
>
> ifdef missing_tools
> DO_INSTALL_MAN = $(warning Please install $(missing_tools) to have the man pages installed)
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] libtraceevent: install html files
2020-10-19 13:42 ` Steven Rostedt
@ 2020-10-19 18:59 ` Sudip Mukherjee
2020-10-19 22:18 ` Steven Rostedt
0 siblings, 1 reply; 4+ messages in thread
From: Sudip Mukherjee @ 2020-10-19 18:59 UTC (permalink / raw)
To: Steven Rostedt; +Cc: Arnaldo Carvalho de Melo, linux-kernel, Linux Trace Devel
Hi Steve,
On Mon, Oct 19, 2020 at 2:42 PM Steven Rostedt <rostedt@goodmis.org> wrote:
>
> On Sun, 18 Oct 2020 22:19:12 +0100
> Sudip Mukherjee <sudipm.mukherjee@gmail.com> wrote:
>
> > Only the man pages were installed using "make install". Add rules to
> > install html files also.
> >
> > Signed-off-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
> > ---
> > tools/lib/traceevent/Documentation/Makefile | 14 ++++++++++++--
>
> Thanks Sudip,
>
> Although, to apply it to the libtraceevent.git repo, I had to strip off the
> "tools/lib/traceevent/" from the file paths.
I was actually confused about which repo is to be followed for
development purposes. I assumed all patches will land here and you
will then mirror them to libtraceevent.git repo when you decide to
make a release. I can send you a patch for libtraceevent.git repo if
you want.
--
Regards
Sudip
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-10-19 22:18 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-10-18 21:19 [PATCH] libtraceevent: install html files Sudip Mukherjee
2020-10-19 13:42 ` Steven Rostedt
2020-10-19 18:59 ` Sudip Mukherjee
2020-10-19 22:18 ` Steven Rostedt
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).