aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2010-12-24 00:25:31 +0100
committerMax Kellermann <max@duempel.org>2010-12-24 00:25:31 +0100
commitb8fe2c74bcddaad9a9914964a7ce12015e7723bf (patch)
treee55b16c83ce409c61f7f6d4a0e1fac14e27c3e8a
parentbe3b5199b02fb2c0e1b5c3fe64e7a67e6ad041d7 (diff)
downloadmpd-b8fe2c74bcddaad9a9914964a7ce12015e7723bf.tar.gz
mpd-b8fe2c74bcddaad9a9914964a7ce12015e7723bf.tar.xz
mpd-b8fe2c74bcddaad9a9914964a7ce12015e7723bf.zip
Makefile.am: generate doxygen.conf
Don't create a modified copy for out-of-tree builds.
Diffstat (limited to '')
-rw-r--r--Makefile.am3
-rw-r--r--configure.ac1
-rw-r--r--doc/doxygen.conf.in (renamed from doc/doxygen.conf)4
3 files changed, 4 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am
index d3eee4504..1efd5605e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1133,8 +1133,7 @@ endif
doc/api/html/index.html: doc/doxygen.conf
@mkdir -p $(@D)
- [ "$(srcdir)" = "." ] || sed '/INPUT *=/ s/\([^ ]\+\/\)/$(subst /,\/,$(srcdir))\/\1/g' $(srcdir)/doc/doxygen.conf >doc/doxygen.conf
- $(DOXYGEN) doc/doxygen.conf
+ $(DOXYGEN) $<
all-local: $(DOCBOOK_HTML) doc/api/html/index.html
diff --git a/configure.ac b/configure.ac
index 4d578c9f0..0b92e70f5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1609,5 +1609,6 @@ dnl ---------------------------------------------------------------------------
dnl Generate files
dnl ---------------------------------------------------------------------------
AC_OUTPUT(Makefile)
+AC_OUTPUT(doc/doxygen.conf)
echo 'MPD is ready for compilation, type "make" to begin.'
diff --git a/doc/doxygen.conf b/doc/doxygen.conf.in
index ddece77e8..8b123737c 100644
--- a/doc/doxygen.conf
+++ b/doc/doxygen.conf.in
@@ -31,7 +31,7 @@ PROJECT_NAME = MPD
# This could be handy for archiving the generated documentation or
# if some version control system is used.
-PROJECT_NUMBER =
+PROJECT_NUMBER = @VERSION@
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put.
@@ -534,7 +534,7 @@ WARN_LOGFILE =
# directories like "/usr/src/myproject". Separate the files or directories
# with spaces.
-INPUT = src/
+INPUT = @top_srcdir@/src/
# This tag can be used to specify the character encoding of the source files
# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is