[gnome-battery-bench] Fix building without asciidoc
- From: Owen Taylor <otaylor src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-battery-bench] Fix building without asciidoc
- Date: Mon, 19 Jan 2015 20:43:15 +0000 (UTC)
commit b35caa6cb26b286ba5f9973537a3f10983e79366
Author: Owen W. Taylor <otaylor fishsoup net>
Date: Mon Jan 19 15:40:33 2015 -0500
Fix building without asciidoc
The conditional check for asciidoc wasn't working correctly - it was not
set correctly and the conditional was actually used in doc/Makefile.am.
configure.ac | 2 +-
docs/Makefile.am | 2 ++
2 files changed, 3 insertions(+), 1 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index e70b81a..671ba5c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,7 +27,7 @@ PKG_CHECK_MODULES([APPLICATION], [$base_packages $x_packages gtk+-3.0 json-glib-
AC_PATH_PROG(ASCIIDOC, asciidoc, "")
AC_PATH_PROG(XMLTO, xmlto, "")
-AM_CONDITIONAL(BUILD_DOCS, [ ASCIIDOC != x -a XMLTO != x ])
+AM_CONDITIONAL(BUILD_DOCS, [ test $ASCIIDOC != x -a $XMLTO != x ])
GLIB_COMPILE_RESOURCES=`$PKG_CONFIG --variable glib_compile_resources gio-2.0`
AC_SUBST(GLIB_COMPILE_RESOURCES)
diff --git a/docs/Makefile.am b/docs/Makefile.am
index f43d9f1..df360f3 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -1,7 +1,9 @@
CLEANFILES =
EXTRA_DIST =
+if BUILD_DOCS
man1_MANS = gbb.1
+endif
EXTRA_DIST += asciidoc.conf gbb.txt
CLEANFILES += gbb.html gbb.1
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]