docs: fix doxygen make distcheck breakage

The docs directory needs to be handled properly, e.g., create Makefile
which nothing, when doxygen is not enabled.

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
This commit is contained in:
Sami Kerola 2013-01-15 20:24:58 +00:00
parent e50d0a7d38
commit 625c54d834
2 changed files with 3 additions and 6 deletions

View file

@ -4,8 +4,4 @@ AUTOMAKE_OPTIONS = gnu
ACLOCAL_AMFLAGS = -I m4 ACLOCAL_AMFLAGS = -I m4
EXTRA_DIST = m4/gnulib-cache.m4 EXTRA_DIST = m4/gnulib-cache.m4
SUBDIRS = lib src man tests contrib SUBDIRS = doc lib src man tests contrib
if ENABLE_DOXYGEN
SUBDIRS += doc
endif

View file

@ -128,7 +128,7 @@ AS_IF([test x$enable_doxygen = xyes], [
AC_CHECK_PROGS([DOXYGEN], [doxygen]) AC_CHECK_PROGS([DOXYGEN], [doxygen])
AS_IF([test "x$DOXYGEN" = "x"], AS_IF([test "x$DOXYGEN" = "x"],
AC_MSG_ERROR([doxygen not in path]), AC_MSG_ERROR([doxygen not in path]),
AC_CONFIG_FILES([doc/Makefile doc/doxy.conf]) AC_CONFIG_FILES([doc/doxy.conf])
) )
AC_CHECK_PROGS([DOXYGEN_DOT], [dot]) AC_CHECK_PROGS([DOXYGEN_DOT], [dot])
@ -146,6 +146,7 @@ AC_CONFIG_FILES([
man/Makefile man/Makefile
man/dhcpd-pools.1 man/dhcpd-pools.1
tests/Makefile tests/Makefile
doc/Makefile
contrib/Makefile contrib/Makefile
]) ])