From fe2042fea8652b5d14824dfd9e0580ed18cbf133 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20R=C3=BChsen?= Date: Tue, 6 Mar 2018 10:21:45 +0100 Subject: [PATCH] Fix make distcheck without enabled docs --- Makefile.am | 10 +++++++++- configure.ac | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 6cbb334..9360c8a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,14 @@ # got some hints from https://gitorious.org/openismus-playground/examplelib/source -SUBDIRS = po include src tools $(LIBPSL_DOCS) fuzz tests +SUBDIRS = po include src tools +if ENABLE_GTK_DOC + SUBDIRS += docs/libpsl +else +if ENABLE_MAN + SUBDIRS += docs/libpsl +endif +endif +SUBDIRS += fuzz tests ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} diff --git a/configure.ac b/configure.ac index 234edc8..7068fbe 100644 --- a/configure.ac +++ b/configure.ac @@ -46,7 +46,6 @@ AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], false) ]) if test x"$have_gtk_doc" = xyes -a x"$enable_gtk_doc" = xyes; then - AC_CONFIG_FILES([docs/libpsl/Makefile docs/libpsl/version.xml]) AC_SUBST([LIBPSL_DOCS], [docs/libpsl]) fi @@ -321,6 +320,7 @@ AC_CONFIG_FILES([Makefile po/Makefile.in fuzz/Makefile tests/Makefile + docs/libpsl/Makefile docs/libpsl/version.xml libpsl.pc:libpsl.pc.in]) AC_OUTPUT