[PATCH libevdev] Avoid shipping generated documentation twice
Peter Hutterer
peter.hutterer at who-t.net
Mon Sep 23 11:22:33 PDT 2013
On Sun, Sep 22, 2013 at 07:34:24PM +0200, Stephen Kitt wrote:
> Only add files to EXTRA_DIST, to avoid having a full copy of doc/html as
> doc/html/html in the distributed tarball.
>
> Signed-off-by: Stephen Kitt <skitt at debian.org>
>
> diff --git a/doc/Makefile.am b/doc/Makefile.am
> index 3fbd0ed..53b2069 100644
> --- a/doc/Makefile.am
> +++ b/doc/Makefile.am
> @@ -9,7 +9,7 @@ clean-local:
>
> .PHONY: doxygen
>
> -doc_src= $(shell find html -name "*" -printf "html/%P\n")
> +doc_src= $(shell find html -type f -printf "html/%P\n")
> EXTRA_DIST = $(doc_src) libevdev.doxygen libevdev.css
> endif
thanks, took me a while to figure out why this even happened, so for the
archives: the file list used by the makefile is
list='./Makefile.in ./Makefile.am ./libevdev.doxygen.in libevdev.doxygen.in
html/ html/doxygen.css html/ftv2link.png [...]
i.e. it has html/ as well as every file in there, and it runs
if test -d ./$file && test $d != .; then \
cp -fpR ./$file "../libevdev-0.4/doc$dir" || exit 1; \
so in addition to the files we re-copy the whole directory too.
thanks for the patch, merged,
f6fc441..92b03c9 master -> master
Cheers,
Peter
More information about the Input-tools
mailing list