Merge branch 'master' into 0.11

[platform/upstream/gstreamer.git] / docs / Makefile.am

diff --git a/docs/Makefile.am b/docs/Makefile.am
index 7b18fde..10847b5 100644 (file)
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -1,16 +1,15 @@
-if ENABLE_GTK_DOC
-GTK_DOC_DIRS = plugins
+if ENABLE_PLUGIN_DOCS
+PLUGIN_DOCS_DIRS = plugins
 else
-GTK_DOC_DIRS =
+PLUGIN_DOCS_DIRS =
 endif
 
-SUBDIRS = $(GTK_DOC_DIRS)
+SUBDIRS = $(PLUGIN_DOCS_DIRS)
 DIST_SUBDIRS = plugins
 
 EXTRA_DIST = \
-        random/ChangeLog-0.8
-upload.mak \
+        random/ChangeLog-0.8 \
         version.entities.in
 
-#upload:
-#      @if test "x$(SUBDIRS_DOCS)" != x; then for a in $(SUBDIRS_DOCS); do cd $$a; make upload; cd ..; done; fi
+upload:
+       @if test "x$(SUBDIRS)" != x; then for a in $(SUBDIRS); do cd $$a; make upload; cd ..; done; fi