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

Gaetan Nadon memsize at videotron.ca
Sun Nov 24 05:02:32 PST 2013


Using srcdir seems counterintuitive but when doxygen is missing,
the html dir is really source code.

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



More information about the Input-tools mailing list