[PATCH libevdev 10/10] doxygen: move dist-hook to "doxygen not installed" section

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


No point suggesting to install doxygen when we already know it is.

There are no scenarios when doxygen is installed, where a tarball cannot
be created with generated html files.

Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
---
 doc/Makefile.am |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/doc/Makefile.am b/doc/Makefile.am
index f8d2eb6..fddbcf1 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -18,16 +18,18 @@ EXTRA_DIST = $(builddir)/html/index.html $(doc_src) libevdev.css
 else
 
 # You may run 'make dist' from a tarball when doxygen is not installed
+# The html files to be distributed will be taken from the srcdir, if present
 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
+# Without doxygen installed, the html files can only come from the tarball
 dist-hook:
 	@test -f $(distdir)/html/index.html || (\
 		echo "******************************************************" && \
 		echo "Couldn't find documentation files, refusing make dist." && \
-		echo "Install doxygen to build documentation for tarball." && \
+		echo "Building from a tarball? Extract it again and retry." && \
+		echo "Building from git? Install doxygen and re-configure." && \
 		echo "******************************************************" && \
 		test )
+
+endif
-- 
1.7.9.5



More information about the Input-tools mailing list