diff options
| author | eb | 2007-03-07 01:43:43 +0000 |
|---|---|---|
| committer | eb | 2007-03-07 01:43:43 +0000 |
| commit | 224434889bf564a4456011180c62a58e0ca55c8f (patch) | |
| tree | fbbbff591fa6a7a9987a6b0b4022ea5f88ab4a3b /usrp/host | |
| parent | 511ddd6cbfd7788f8a2cb3634d898d7c5fdd29fb (diff) | |
| download | gnuradio-224434889bf564a4456011180c62a58e0ca55c8f.tar.gz gnuradio-224434889bf564a4456011180c62a58e0ca55c8f.tar.bz2 gnuradio-224434889bf564a4456011180c62a58e0ca55c8f.zip | |
Merged eb/usrp-install r4723:4727 into trunk.
This moves usrp related .py files from the top-level of site-packages
into site-packages/usrpm.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@4728 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'usrp/host')
| -rw-r--r-- | usrp/host/lib/Makefile.am | 4 | ||||
| -rw-r--r-- | usrp/host/swig/Makefile.am | 8 | ||||
| -rw-r--r-- | usrp/host/swig/usrp_fpga_regs.py | 2 |
3 files changed, 6 insertions, 8 deletions
diff --git a/usrp/host/lib/Makefile.am b/usrp/host/lib/Makefile.am index 83f2984e7..7d17a380a 100644 --- a/usrp/host/lib/Makefile.am +++ b/usrp/host/lib/Makefile.am @@ -1,7 +1,7 @@ # # USRP - Universal Software Radio Peripheral # -# Copyright (C) 2003,2004,2006 Free Software Foundation, Inc. +# Copyright (C) 2003,2004,2006,2007 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -137,7 +137,7 @@ noinst_HEADERS = \ rate_to_regval.h \ usrp_local_sighandler.h -python_PYTHON = \ +usrppython_PYTHON = \ usrp_dbid.py noinst_PYTHON = \ diff --git a/usrp/host/swig/Makefile.am b/usrp/host/swig/Makefile.am index be3bbf2a9..8868d1ecb 100644 --- a/usrp/host/swig/Makefile.am +++ b/usrp/host/swig/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2001,2003,2004,2006 Free Software Foundation, Inc. +# Copyright 2001,2003,2004,2006,2007 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -21,11 +21,9 @@ include $(top_srcdir)/Makefile.common -# This usually ends up at: -# ${prefix}/lib/python${python_version}/site-packages/usrp_prims +ourpythondir = $(usrppythondir) +ourlibdir = $(usrppyexecdir) -ourpythondir = $(pythondir) -ourlibdir = $(pyexecdir) INCLUDES = $(USRP_INCLUDES) \ $(PYTHON_CPPFLAGS) \ diff --git a/usrp/host/swig/usrp_fpga_regs.py b/usrp/host/swig/usrp_fpga_regs.py index 1b8b19cad..e022518bd 100644 --- a/usrp/host/swig/usrp_fpga_regs.py +++ b/usrp/host/swig/usrp_fpga_regs.py @@ -19,7 +19,7 @@ # Boston, MA 02110-1301, USA. # -import usrp_prims +from usrpm import usrp_prims # Copy everything that starts with FR_ or bmFR_ from the usrp_prims # name space into our name space. This is effectively a python binding for |