[gnome-builder: 7/139] build: use -Dhelp=true to enable help docs

[Christian Hergert <chergert src gnome org>]

commit 11b9d1d5adb68de68359b94e4c945fa993c730e6
Author: Christian Hergert <chergert redhat com>
Date:   Wed Jan 9 15:00:08 2019 -0800

    build: use -Dhelp=true to enable help docs

 build-aux/flatpak/org.gnome.Builder.json | 2 +-
 doc/help/meson.build                     | 2 +-
 doc/meson.build                          | 8 ++------
 meson_options.txt                        | 2 +-
 4 files changed, 5 insertions(+), 9 deletions(-)
---
diff --git a/build-aux/flatpak/org.gnome.Builder.json b/build-aux/flatpak/org.gnome.Builder.json
index 5fd39c736..45a0139e5 100644
--- a/build-aux/flatpak/org.gnome.Builder.json
+++ b/build-aux/flatpak/org.gnome.Builder.json
@@ -521,7 +521,7 @@
                 "-Dwith_tcmalloc=true",
                 "-Dpython_libprefix=python3.7",
                 "-Denable_tracing=true",
-                "-Dwith_help=true",
+                "-Dhelp=true",
                 "-Dwith_channel=flatpak-nightly",
                 "-Dwith_deviced=true"
             ],
diff --git a/doc/help/meson.build b/doc/help/meson.build
index e684f078c..9020fa8b5 100644
--- a/doc/help/meson.build
+++ b/doc/help/meson.build
@@ -1,4 +1,4 @@
-if get_option('with_help')
+if get_option('help')
 
 sphinx = find_program(['sphinx-build-3', 'sphinx-build'], required: true)
 
diff --git a/doc/meson.build b/doc/meson.build
index 9e18f7e89..f2a084048 100644
--- a/doc/meson.build
+++ b/doc/meson.build
@@ -1,6 +1,2 @@
-if get_option('with_help')
-  subdir('help')
-endif
-if get_option('with_docs')
-  subdir('sdk')
-endif
+subdir('help')
+subdir('sdk')
diff --git a/meson_options.txt b/meson_options.txt
index 68fe4227c..0a8cc7c5d 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -10,10 +10,10 @@ option('with_channel',
    description: 'The distribution channel for Builder',
 )
 
+option('help', type: 'boolean', value: false)
 option('with_editorconfig', type: 'boolean')
 option('with_webkit', type: 'boolean')
 option('with_vapi', type: 'boolean')
-option('with_help', type: 'boolean', value: false)
 option('with_docs', type: 'boolean', value: false)
 
 option('network_tests', type: 'boolean', value: true, description: 'Allow networking in unit-tests')