[gnome-builder] build: make distcheck work again

[Christian Hergert <chergert src gnome org>]

commit c33ba454bd13a015de002211d2ce230752be1548
Author: Christian Hergert <chergert redhat com>
Date:   Mon Feb 27 16:52:44 2017 -0800

    build: make distcheck work again
    
    Really, we need to improve Makefile.plugin to support nobase_* variables so that
    these actually test correctly.

 doc/Makefile.am            |   48 ++++++++++++++++++++++----------------------
 plugins/rustup/Makefile.am |    9 ++-----
 2 files changed, 27 insertions(+), 30 deletions(-)
---
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 71bdf47..5fdeb53 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,43 +1,43 @@
 SUBDIRS = examples
 
 EXTRA_DIST =                               \
-       api/index.rst                      \
        credits.rst                        \
-       index.rst                          \
-       introduction.rst                   \
+       plugins/running.rst                \
+       plugins/building/pipeline.rst      \
        plugins/building/buildsystem.rst   \
        plugins/building/index.rst         \
-       plugins/building/pipeline.rst      \
-       plugins/creating.rst               \
-       plugins/devices.rst                \
-       plugins/editor/autocompletion.rst  \
-       plugins/editor/buffers.rst         \
-       plugins/editor/diagnostics.rst     \
-       plugins/editor/filesettings.rst    \
+       plugins/keybindings.rst            \
        plugins/editor/highlighting.rst    \
+       plugins/editor/buffers.rst         \
        plugins/editor/index.rst           \
        plugins/editor/snippets.rst        \
-       plugins/greeter.rst                \
+       plugins/editor/autocompletion.rst  \
+       plugins/editor/filesettings.rst    \
+       plugins/editor/diagnostics.rst     \
+       plugins/transfers.rst              \
+       plugins/workers.rst                \
        plugins/headerbar.rst              \
-       plugins/index.rst                  \
-       plugins/keybindings.rst            \
+       plugins/greeter.rst                \
        plugins/langserv.rst               \
-       plugins/preferences.rst            \
-       plugins/processes/index.rst        \
-       plugins/processes/runtimes.rst     \
-       plugins/processes/subprocesses.rst \
-       plugins/running.rst                \
+       plugins/index.rst                  \
        plugins/search.rst                 \
-       plugins/subprocesses.rst           \
-       plugins/symbols/gotodef.rst        \
        plugins/symbols/index.rst          \
-       plugins/symbols/rename.rst         \
        plugins/symbols/symbols.rst        \
-       plugins/transfers.rst              \
+       plugins/symbols/rename.rst         \
+       plugins/symbols/gotodef.rst        \
+       plugins/devices.rst                \
        plugins/vcs.rst                    \
+       plugins/creating.rst               \
+       plugins/processes/runtimes.rst     \
+       plugins/processes/subprocesses.rst \
+       plugins/processes/index.rst        \
        plugins/workbench.rst              \
-       plugins/workers.rst                \
-       workbench.rst                      \
+       plugins/preferences.rst            \
+       exploring.rst                      \
+       api/index.rst                      \
+       index.rst                          \
+       installation.rst                   \
+       contributing.rst                   \
        $(NULL)
 
 GITIGNOREFILES = _build
diff --git a/plugins/rustup/Makefile.am b/plugins/rustup/Makefile.am
index f3b5886..860df01 100644
--- a/plugins/rustup/Makefile.am
+++ b/plugins/rustup/Makefile.am
@@ -1,6 +1,5 @@
 if ENABLE_RUSTUP_PLUGIN
 
-EXTRA_DIST = $(plugin_DATA)
 
 plugindir = $(libdir)/gnome-builder/plugins
 dist_plugin_DATA = rustup.plugin
@@ -9,12 +8,10 @@ moduledir = $(libdir)/gnome-builder/plugins/rustup_plugin
 dist_module_DATA = rustup_plugin/__init__.py
 
 resourcedir = $(datadir)/gnome-builder/plugins/
-nobase_resource_DATA =                    \
-       rustup_plugin/resources/rustup.sh \
-       $(NULL)
+nobase_resource_DATA = rustup_plugin/resources/rustup.sh
 
-endif
+EXTRA_DIST = $(nobase_resource_DATA)
 
-include $(top_srcdir)/plugins/Makefile.plugin
+endif
 
 -include $(top_srcdir)/git.mk