4 files changed, 27 insertions, 3 deletions
diff --git a/gr-noaa/swig/CMakeLists.txt b/gr-noaa/swig/CMakeLists.txt
index 1d754aabb..a8335062c 100644
--- a/gr-noaa/swig/CMakeLists.txt
+++ b/gr-noaa/swig/CMakeLists.txt
@@ -28,6 +28,9 @@ set(GR_SWIG_INCLUDE_DIRS
     ${GNURADIO_CORE_SWIG_INCLUDE_DIRS}
 )
 
+set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/noaa_swig_doc.i)
+set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../lib)
+
 set(GR_SWIG_LIBRARIES gnuradio-noaa)
 
 GR_SWIG_MAKE(noaa_swig noaa_swig.i)
@@ -44,6 +47,7 @@ install(
     noaa_hrpt_decoder.i
     noaa_hrpt_deframer.i
     noaa_hrpt_pll_cf.i
+    ${CMAKE_CURRENT_BINARY_DIR}/noaa_swig_doc.i
     DESTINATION ${GR_INCLUDE_DIR}/gnuradio/swig
     COMPONENT "noaa_swig"
 )
diff --git a/gr-noaa/swig/Makefile.am b/gr-noaa/swig/Makefile.am
index 629c67e99..308bcf083 100644
--- a/gr-noaa/swig/Makefile.am
+++ b/gr-noaa/swig/Makefile.am
@@ -45,6 +45,18 @@ AM_CPPFLAGS = \
 TOP_SWIG_IFILES = \
 	noaa_swig.i
 
+TOP_SWIG_DOC_IFILES = \
+	noaa_swig_doc.i
+
+BUILT_SOURCES += \
+	$(TOP_SWIG_DOC_IFILES)
+
+EXTRA_DIST += \
+	$(TOP_SWIG_DOC_IFILES)
+
+$(TOP_SWIG_DOC_IFILES):
+	`echo "" > $@`
+
 # Install so that they end up available as:
 #   import gnuradio.noaa
 # This ends up at:
@@ -62,9 +74,10 @@ noaa_swig_python = \
 
 # additional SWIG files to be installed
 noaa_swig_swiginclude_headers =	\
-	noaa_hrpt_decoder.i \
-	noaa_hrpt_deframer.i \
-	noaa_hrpt_pll_cf.i
+	noaa_hrpt_decoder.i 	\
+	noaa_hrpt_deframer.i 	\
+	noaa_hrpt_pll_cf.i 	\
+	$(TOP_SWIG_DOC_IFILES)
 
 if GUILE
 TESTS += run_guile_tests
diff --git a/gr-noaa/swig/__init__.py b/gr-noaa/swig/__init__.py
index d8d337e65..b82603953 100644
--- a/gr-noaa/swig/__init__.py
+++ b/gr-noaa/swig/__init__.py
@@ -21,6 +21,10 @@
 
 # The presence of this file turns this directory into a Python package
 
+'''
+The GNU Radio NOAA package.
+'''
+
 # Add SWIG generated code to this namespace
 from noaa_swig import *
 
diff --git a/gr-noaa/swig/noaa_swig.i b/gr-noaa/swig/noaa_swig.i
index 3b6e92149..bc139651d 100644
--- a/gr-noaa/swig/noaa_swig.i
+++ b/gr-noaa/swig/noaa_swig.i
@@ -22,6 +22,9 @@
 
 %include "gnuradio.i"
 
+//load generated python docstrings
+%include "noaa_swig_doc.i"
+
 %{
 #include <noaa_hrpt_decoder.h>
 #include <noaa_hrpt_deframer.h>