autotools: fix out-of-tree building of documentation

When building libusb out-of-tree, ie when running configure from another
directory, building the documentation fails with:

  $ make -C doc
  make: Entering directory '/tmp/build/doc'
  make: *** No rule to make target 'libusb.png', needed by 'api-1.0'.  Stop.
  make: Leaving directory '/tmp/build/doc'

This has likely been broken by commit 4a5540a925e4 ("autotools: Fix a number of
issues"). This patch fixes that by prefixing libusb.png with @top_srcdir@/doc.

Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>

diff --git a/doc/Makefile.in b/doc/Makefile.in
index 26400b5..45c3209 100644 (file)
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -5,7 +5,7 @@ LIBUSB_DOC_SRC = $(filter-out $(addprefix $(LIBUSB_SRC_DIR)/,$(EXCLUDED_FILES)),
 
 docs: @DOXYGEN_HTMLDIR@
 
-@DOXYGEN_HTMLDIR@: doxygen.cfg libusb.png $(LIBUSB_DOC_SRC)
+@DOXYGEN_HTMLDIR@: doxygen.cfg @top_srcdir@/doc/libusb.png $(LIBUSB_DOC_SRC)
        doxygen $<
 
 sfurl = web.sourceforge.net:/home/project-web/libusb/htdocs

diff --git a/doc/doxygen.cfg.in b/doc/doxygen.cfg.in
index f4ccf1e..569e465 100644 (file)
--- a/doc/doxygen.cfg.in
+++ b/doc/doxygen.cfg.in
@@ -51,7 +51,7 @@ PROJECT_BRIEF          = "A cross-platform user library to access USB devices"
 # pixels and the maximum width should not exceed 200 pixels. Doxygen will copy
 # the logo to the output directory.
 
-PROJECT_LOGO           = libusb.png
+PROJECT_LOGO           = @top_srcdir@/doc/libusb.png
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
 # into which the generated documentation will be written. If a relative path is

diff --git a/libusb/version_nano.h b/libusb/version_nano.h
index 7348f67..273669a 100644 (file)
--- a/libusb/version_nano.h
+++ b/libusb/version_nano.h
@@ -1 +1 @@
-#define LIBUSB_NANO 11582
+#define LIBUSB_NANO 11583