summaryrefslogtreecommitdiff
path: root/gr-howto-write-a-block/swig
diff options
context:
space:
mode:
authorTom Rondeau <trondeau@vt.edu>2011-02-22 17:02:11 -0500
committerTom Rondeau <trondeau@vt.edu>2011-02-22 17:02:11 -0500
commit1e9881f41043eeca497ff6ed4a7fc9d810a7fb5b (patch)
tree3d8d23e268e67924e41d438a2cb9687fed509715 /gr-howto-write-a-block/swig
parent4e33fbc5b96d01870ddfc76d11baae7194894d9f (diff)
howto: cleans up the Python build structure for howto; reverts back to making it's own howto module not under gnuradio.
Diffstat (limited to 'gr-howto-write-a-block/swig')
-rw-r--r--gr-howto-write-a-block/swig/Makefile.am3
-rw-r--r--gr-howto-write-a-block/swig/Makefile.swig.gen2
2 files changed, 4 insertions, 1 deletions
diff --git a/gr-howto-write-a-block/swig/Makefile.am b/gr-howto-write-a-block/swig/Makefile.am
index 7ec3a7cbc1..66d08eaf31 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
diff --git a/gr-howto-write-a-block/swig/Makefile.swig.gen b/gr-howto-write-a-block/swig/Makefile.swig.gen
index 1e63fcb0db..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
+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)