2 files changed, 45 insertions, 1 deletions
diff --git a/docs/sphinx/source/conf.py b/docs/sphinx/source/conf.py.in
index 6fa24218e..37b945aa7 100644
--- a/docs/sphinx/source/conf.py
+++ b/docs/sphinx/source/conf.py.in
@@ -16,7 +16,8 @@ import sys, os
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
-sys.path.insert(0, os.path.abspath('..'))
+sys.path.insert(0, os.path.abspath('@CMAKE_CURRENT_SOURCE_DIR@'))
+sys.path.insert(0, '@CMAKE_INSTALL_PREFIX@/@GR_PYTHON_DIR@')
 
 # -- General configuration -----------------------------------------------------
 
diff --git a/docs/sphinx/source/index.rst b/docs/sphinx/source/index.rst
index d931a0dcb..887271ce0 100644
--- a/docs/sphinx/source/index.rst
+++ b/docs/sphinx/source/index.rst
@@ -73,3 +73,46 @@ Framework Extensions
    gnuradio.pager <pager/index>
    gnuradio.video_sdl <video_sdl>
    gnuradio.vocoder <vocoder/index>
+
+
+.. Use this to add to the toctree but not displayed
+.. It's mostly to get rid of warnings
+ 
+.. toctree::
+   :hidden:   
+   
+   coding <gr/coding_blk>
+   converter <gr/converter_blk>
+   demodulation <gr/demodulation_blk>
+   dft <gr/dft_blk>
+   filter <gr/filter_blk>
+   filter_design <gr/filter_design>
+   internal <gr/internal>
+   level <gr/level_blk>
+   math <gr/math_blk>
+   misc <gr/misc>
+   misc <gr/misc_blk>
+   modulation <gr/modulation_blk>
+   sink <gr/sink_blk>
+   slicedice <gr/slicedice_blk>
+   source <gr/source_blk>
+   sync <gr/sync_blk>
+   top_block <gr/top_block>
+
+   atsc_blks <atsc/blks>
+   blks <blks2/blks>
+   blks2_utilities <blks2/utilities>
+   digital_blocks <digital/blocks>
+   constellations <digital/constellations>
+   ofdm <digital/ofdm>
+   pkt_utils <digital/pkt_utils>
+   digital_utilities <digital/utilities>
+   optfir <optfir/detail>
+   pager_blks <pager/blks>
+   pyqt_filter <pyqt_filter>
+   pyqt_plot <pyqt_plot>
+   trellis_blks <trellis/blks>
+   trellis_objs <trellis/objs>
+   vocoder_blks <vocoder/blks>
+   window_detail <window/detail>
+   wxgui_blks <wxgui/blks>