From 4d6823a20a9c7481a815016024dc427cc33aa7c5 Mon Sep 17 00:00:00 2001
From: Mike Fleetwood <mike.fleetwood@googlemail.com>
Date: Sun, 16 Oct 2016 11:33:06 +0100
Subject: [PATCH] Switch to conditional appending of SUBDIRS in top-level
 Makefile.am (#781978)

rather than having two conditional complete definitions of SUBDIRS.

Bug 781978 - Add Google Test C++ test framework
---
 Makefile.am | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 56d32c0b..478cbf8a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,8 +1,8 @@
-# Only execute make in the help subdirectory if BUILD_HELP_DOC is set
-if BUILD_HELP_DOC
-SUBDIRS = help compose data doc include po src
-else
 SUBDIRS = compose data doc include po src
+# Only build GParted help documentation when enabled.  (Can be disabled
+# with './configure --disable-doc').
+if BUILD_HELP_DOC
+  SUBDIRS += help
 endif
 
 @INTLTOOL_DESKTOP_RULE@