diff options
| author | Nick Foster | 2011-04-13 17:18:14 -0700 |
|---|---|---|
| committer | Nick Foster | 2011-04-13 17:18:14 -0700 |
| commit | 9b7d444aaebbe0708e9703bce30c63b63bc81825 (patch) | |
| tree | 29121aa250decfb1ed9ca7876e1857eec8779d83 /gr-howto-write-a-block/Makefile.swig.gen.t | |
| parent | 258186d5ca2e811ced7ea637fd16e3ed3bb5573e (diff) | |
| parent | e8ff9ef4bb77517428e1208ff4b3551a38107bbd (diff) | |
| download | gnuradio-9b7d444aaebbe0708e9703bce30c63b63bc81825.tar.gz gnuradio-9b7d444aaebbe0708e9703bce30c63b63bc81825.tar.bz2 gnuradio-9b7d444aaebbe0708e9703bce30c63b63bc81825.zip | |
Merge branch 'master' of http://gnuradio.org/git/gnuradio into cpuid
Conflicts:
volk/Makefile.common
volk/lib/qa_utils.cc
Diffstat (limited to 'gr-howto-write-a-block/Makefile.swig.gen.t')
| -rw-r--r-- | gr-howto-write-a-block/Makefile.swig.gen.t | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gr-howto-write-a-block/Makefile.swig.gen.t b/gr-howto-write-a-block/Makefile.swig.gen.t index 4d37e0e21..3c76ee4b4 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) |