From 6c3b6396bc420228215072b2fc1b83c82eaeb291 Mon Sep 17 00:00:00 2001 From: Eric Blossom <eb@comsec.com> Date: Thu, 4 Mar 2010 07:02:42 -0800 Subject: Refactor gr-howto-write-a-block such that it no longer installs into the gnuradio python namespace, but rather in the howto namespace. This allows it to be installed under a separate --prefix in the common case where the user doing the "out of tree build" is going to be installing their new and/or modified code somewhere other than the system installation directories. Any code that uses these blocks should now import them using: import howto instead of from gnuradio import howto --- gr-howto-write-a-block/swig/Makefile.swig.gen | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'gr-howto-write-a-block/swig/Makefile.swig.gen') diff --git a/gr-howto-write-a-block/swig/Makefile.swig.gen b/gr-howto-write-a-block/swig/Makefile.swig.gen index c62e5aa3e0..1809032d33 100644 --- a/gr-howto-write-a-block/swig/Makefile.swig.gen +++ b/gr-howto-write-a-block/swig/Makefile.swig.gen @@ -33,10 +33,8 @@ ## this has to be done in the including Makefile.am -before- ## Makefile.swig is included. -howto_pythondir_category ?= gnuradio/howto -howto_pylibdir_category ?= $(howto_pythondir_category) -howto_pythondir = $(pythondir)/$(howto_pythondir_category) -howto_pylibdir = $(pyexecdir)/$(howto_pylibdir_category) +howto_pythondir = $(pythondir)/howto +howto_pylibdir = $(pyexecdir)/howto ## SWIG headers are always installed into the same directory. @@ -79,7 +77,7 @@ swig_built_sources += howto_swig.py howto_swig.cc ## Makefile.swig . howto_swiginclude_HEADERS = \ - howto.i \ + howto.i \ $(howto_swiginclude_headers) howto_pylib_LTLIBRARIES = \ @@ -89,7 +87,7 @@ _howto_swig_la_SOURCES = \ howto_swig.cc \ $(howto_la_swig_sources) -_howto_swig_la_LIBADD = \ +_howto_swig_la_LIBADD = \ $(STD_SWIG_LA_LIB_ADD) \ $(howto_la_swig_libadd) -- cgit v1.2.3