4 files changed, 9 insertions, 7 deletions
diff --git a/gr-howto-write-a-block/Makefile.swig.gen.t b/gr-howto-write-a-block/Makefile.swig.gen.t
index 4d37e0e215..3c76ee4b40 100644
--- a/gr-howto-write-a-block/Makefile.swig.gen.t
+++ b/gr-howto-write-a-block/Makefile.swig.gen.t
@@ -33,7 +33,7 @@
 ## this has to be done in the including Makefile.am -before-
 ## Makefile.swig is included.
 
-@NAME@_pythondir_category ?= gnuradio/@NAME@
+@NAME@_pythondir_category ?= @NAME@
 @NAME@_pylibdir_category ?= $(@NAME@_pythondir_category)
 @NAME@_pythondir = $(pythondir)/$(@NAME@_pythondir_category)
 @NAME@_pylibdir = $(pyexecdir)/$(@NAME@_pylibdir_category)
diff --git a/gr-howto-write-a-block/swig/Makefile.am b/gr-howto-write-a-block/swig/Makefile.am
index ba660f1b39..3260042351 100644
--- a/gr-howto-write-a-block/swig/Makefile.am
+++ b/gr-howto-write-a-block/swig/Makefile.am
@@ -36,6 +36,9 @@ TOP_SWIG_IFILES = \
 #   import howto
 # This ends up at:
 #   ${prefix}/lib/python${python_version}/site-packages/$(modname)
+howto_swig_pythondir_category = $(modname)
+
+# additional libraries for linking with the SWIG-generated library
 howto_swig_la_swig_libadd = \
 	$(top_builddir)/lib/libgnuradio-howto.la
 
@@ -46,11 +49,10 @@ howto_swiginclude_headers = \
 
 EXTRA_DIST = $(howto_swiginclude_headers)
 
-
 if GUILE
 TESTS = run_guile_tests
-EXTRA_DIST += $(nobase_guile_DATA)
-
 nobase_guile_DATA = \
-	gnuradio/howto.scm
+	gnuradio/howto_swig.scm
 endif
+
+EXTRA_DIST += $(nobase_guile_DATA)
diff --git a/gr-howto-write-a-block/swig/Makefile.swig.gen b/gr-howto-write-a-block/swig/Makefile.swig.gen
index 310cfb8da7..6b7be2185c 100644
--- a/gr-howto-write-a-block/swig/Makefile.swig.gen
+++ b/gr-howto-write-a-block/swig/Makefile.swig.gen
@@ -33,7 +33,7 @@
 ## this has to be done in the including Makefile.am -before-
 ## Makefile.swig is included.
 
-howto_swig_pythondir_category ?= gnuradio/howto_swig
+howto_swig_pythondir_category ?= howto_swig
 howto_swig_pylibdir_category ?= $(howto_swig_pythondir_category)
 howto_swig_pythondir = $(pythondir)/$(howto_swig_pythondir_category)
 howto_swig_pylibdir = $(pyexecdir)/$(howto_swig_pylibdir_category)
diff --git a/gr-howto-write-a-block/swig/howto.test b/gr-howto-write-a-block/swig/howto.test
index ffe7251cd8..dc257a61e3 100644
--- a/gr-howto-write-a-block/swig/howto.test
+++ b/gr-howto-write-a-block/swig/howto.test
@@ -33,7 +33,7 @@
 
 
 ;; Use our module
-(use-modules (gnuradio howto))
+(use-modules (gnuradio howto_swig))
 
 
 (define (vector-map f v)