[PATCH libevdev 08/10] doxygen: fix 'distcheck' for tarballs srcdir!=builddir without doxygen

[Peter Hutterer]

Hi Gaetan,

On Sun, Nov 24, 2013 at 08:02:32AM -0500, Gaetan Nadon wrote:
> Using srcdir seems counterintuitive but when doxygen is missing,
> the html dir is really source code.

I don't think there's really a need for this particular fix. make dist is a
maintainer task and we should expect maintainers to install all packages.
with the patch below there's even the slim chance of a tarball getting
released with out-dated documentation (e.g. if I remove doxygen for some
testing and then forget to re-install it. it may pick up the old sources)

Cheers,
   Peter

> Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
> ---
>  doc/Makefile.am |    9 +++++++--
>  1 file changed, 7 insertions(+), 2 deletions(-)
> 
> diff --git a/doc/Makefile.am b/doc/Makefile.am
> index 4389f16..7cdd7ea 100644
> --- a/doc/Makefile.am
> +++ b/doc/Makefile.am
> @@ -12,12 +12,17 @@ html/index.html: libevdev.doxygen $(header_files)
>  clean-local:
>  	$(AM_V_at)rm -rf html
>  
> -endif
> +doc_src= $(shell find $(builddir)/html -type f -printf "html/%P\n" 2>/dev/null)
> +EXTRA_DIST = $(doc_src) libevdev.css
> +
> +else
>  
>  # You may run 'make dist' from a tarball when doxygen is not installed
> -doc_src= $(shell find html -type f -printf "html/%P\n" 2>/dev/null)
> +doc_src= $(shell find $(srcdir)/html -type f -printf "html/%P\n" 2>/dev/null)
>  EXTRA_DIST = $(doc_src) libevdev.css
>  
> +endif
> +
>  # make sure doc was built before running dist
>  dist-hook:
>  	@test -f $(distdir)/html/index.html || (\
> -- 
> 1.7.9.5
> 
> _______________________________________________
> Input-tools mailing list
> Input-tools at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/input-tools