Re: [PATCH 4/4] docs: Don't leave any documentation behind

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 




On 04/19/2016 09:50 AM, Michal Privoznik wrote:
> Our uninstall script is not exact counterpart of install one.
> Therefore we are leaving couple of files behind. This should not
> happen.
> 
> Signed-off-by: Michal Privoznik <mprivozn@xxxxxxxxxx>
> ---
>  docs/Makefile.am | 6 ++++++
>  1 file changed, 6 insertions(+)
> 

At 'install-data-local:', there's a :

        $(mkinstalldirs) $(DESTDIR)$(HTML_DIR)

why not just the far more all encompassing:

   rm -rf $(DESTDIR)$(HTML_DIR)

and

   rm -rf $(DESTDIR)$(DEVHELP_DIR)

Rather than picking each part we install to uninstall? and missing
something in the future or even now.  Do the 'html' or 'internals'
directories gets removed?  And then of course the toplevel directory
which we created.

IOW: There's no corollary for the:

        $(mkinstalldirs) $(DESTDIR)$(HTML_DIR)
        $(mkinstalldirs) $(DESTDIR)$(HTML_DIR)/html
        $(mkinstalldirs) $(DESTDIR)$(HTML_DIR)/internals
        $(mkinstalldirs) $(DESTDIR)$(DEVHELP_DIR)



John

> diff --git a/docs/Makefile.am b/docs/Makefile.am
> index c80c37b..9524c94 100644
> --- a/docs/Makefile.am
> +++ b/docs/Makefile.am
> @@ -363,8 +363,14 @@ install-data-local:
>  	$(INSTALL_DATA) $(srcdir)/libvirtLogo.png $(DESTDIR)$(pkgdatadir)
>  
>  uninstall-local:
> +	for f in $(css) $(dot_html) $(gif) $(png); do \
> +	  rm -f $(DESTDIR)$(HTML_DIR)/$$f; \
> +	done
>  	for h in $(apihtml); do rm -f $(DESTDIR)$(HTML_DIR)/$$h; done
>  	for p in $(apipng); do rm -f $(DESTDIR)$(HTML_DIR)/$$p; done
> +	for f in $(internals_html); do \
> +	  rm -f $(DESTDIR)$(HTML_DIR)/$$f; \
> +	done
>  	for f in $(devhelphtml) $(devhelppng) $(devhelpcss); do \
>  	  rm -f $(DESTDIR)$(DEVHELP_DIR)/$$(basename $$f); \
>  	done
> 

--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list



[Index of Archives]     [Virt Tools]     [Libvirt Users]     [Lib OS Info]     [Fedora Users]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [KDE Users]     [Fedora Tools]