[PATCH] libtraceevent: install html files

[PATCH] libtraceevent: install html files

[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

Re: [PATCH] libtraceevent: install html files

[Steven Rostedt]

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)

Re: [PATCH] libtraceevent: install html files

[Sudip Mukherjee]

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

Re: [PATCH] libtraceevent: install html files

[Steven Rostedt]

On Mon, 19 Oct 2020 19:59:18 +0100
Sudip Mukherjee <sudipm.mukherjee@gmail.com> wrote:

> 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.

A release has already been made:

  https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git/snapshot/libtraceevent-1.1.0.tar.gz

-- Steve