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

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 =				\

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) 		\

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