7 files changed, 12 insertions, 12 deletions
diff --git a/Makefile.swig.gen.t b/Makefile.swig.gen.t
index 6f852c3674..41532bfd12 100644
--- a/Makefile.swig.gen.t
+++ b/Makefile.swig.gen.t
@@ -41,7 +41,7 @@
 # The .so libraries for the guile modules get installed whereever guile
 # is installed, usually /usr/lib/guile/gnuradio/
 # FIXME: determince whether these should be installed with gnuradio.
-@NAME@_scmlibdir = $(libdir)/guile/gnuradio
+@NAME@_scmlibdir = $(libdir)
 
 # The scm files for the guile modules get installed where ever guile
 # is installed, usually /usr/share/guile/site/@NAME@
@@ -124,16 +124,16 @@ _@NAME@_la_CXXFLAGS =			\
 	$(@NAME@)
 
 if GUILE
-@NAME@_scmlib_LTLIBRARIES = @NAME@_guile.la
-@NAME@_guile_la_SOURCES = 		\
+@NAME@_scmlib_LTLIBRARIES = libguile-@NAME@.la
+libguile_@NAME@_la_SOURCES = 		\
 	guile/@NAME@.cc			\
 	$(@NAME@_la_swig_sources)
 @NAME@_scm_DATA = @NAME@.scm
 
 # Guile can use the same flags as python does
-@NAME@_guile_la_LIBADD = $(_@NAME@_la_LIBADD)
-@NAME@_guile_la_LDFLAGS = $(_@NAME@_la_LDFLAGS)
-@NAME@_guile_la_CXXFLAGS = $(_@NAME@_la_CXXFLAGS)
+libguile_@NAME@_la_LIBADD = $(_@NAME@_la_LIBADD)
+libguile_@NAME@_la_LDFLAGS = $(_@NAME@_la_LDFLAGS)
+libguile_@NAME@_la_CXXFLAGS = $(_@NAME@_la_CXXFLAGS)
 
 guile/@NAME@.lo: @NAME@.lo
 @NAME@.scm: @NAME@.i
diff --git a/gnuradio-core/src/lib/swig/gnuradio_swig_py_filter.i b/gnuradio-core/src/lib/swig/gnuradio_swig_py_filter.i
index cb9eb35a77..e40af08caa 100644
--- a/gnuradio-core/src/lib/swig/gnuradio_swig_py_filter.i
+++ b/gnuradio-core/src/lib/swig/gnuradio_swig_py_filter.i
@@ -31,6 +31,6 @@
 
 #if SWIGGUILE
 %scheme %{
-(load-extension "gnuradio_swig_py_filter_guile" "SWIG_init")
+(load-extension "libguile-gnuradio_swig_py_filter" "SWIG_init")
 %}
  #endif
diff --git a/gnuradio-core/src/lib/swig/gnuradio_swig_py_general.i b/gnuradio-core/src/lib/swig/gnuradio_swig_py_general.i
index 05ed69d315..c4e9c070d2 100644
--- a/gnuradio-core/src/lib/swig/gnuradio_swig_py_general.i
+++ b/gnuradio-core/src/lib/swig/gnuradio_swig_py_general.i
@@ -31,6 +31,6 @@
 
 #if SWIGGUILE
 %scheme %{
-(load-extension "gnuradio_swig_py_general_guile" "SWIG_init")
+(load-extension "libguile-gnuradio_swig_py_general" "SWIG_init")
 %}
 #endif
diff --git a/gnuradio-core/src/lib/swig/gnuradio_swig_py_gengen.i b/gnuradio-core/src/lib/swig/gnuradio_swig_py_gengen.i
index 64b9c804db..54e1b0944b 100644
--- a/gnuradio-core/src/lib/swig/gnuradio_swig_py_gengen.i
+++ b/gnuradio-core/src/lib/swig/gnuradio_swig_py_gengen.i
@@ -31,6 +31,6 @@
 
 #if SWIGGUILE
 %scheme %{
-(load-extension "gnuradio_swig_py_gengen_guile" "SWIG_init")
+(load-extension "libguile-gnuradio_swig_py_gengen" "SWIG_init")
 %}
 #endif
diff --git a/gnuradio-core/src/lib/swig/gnuradio_swig_py_hier.i b/gnuradio-core/src/lib/swig/gnuradio_swig_py_hier.i
index c3bf32d6a6..61029b1206 100644
--- a/gnuradio-core/src/lib/swig/gnuradio_swig_py_hier.i
+++ b/gnuradio-core/src/lib/swig/gnuradio_swig_py_hier.i
@@ -31,6 +31,6 @@
 
 #if SWIGGUILE
 %scheme %{
-(load-extension "gnuradio_swig_py_heir_guile" "SWIG_init")
+(load-extension "libguile-gnuradio_swig_py_heir" "SWIG_init")
 %}
 #endif
diff --git a/gnuradio-core/src/lib/swig/gnuradio_swig_py_io.i b/gnuradio-core/src/lib/swig/gnuradio_swig_py_io.i
index c3ed7c6baf..d7d206ef82 100644
--- a/gnuradio-core/src/lib/swig/gnuradio_swig_py_io.i
+++ b/gnuradio-core/src/lib/swig/gnuradio_swig_py_io.i
@@ -31,6 +31,6 @@
 
 #if SWIGGUILE
 %scheme %{
-(load-extension "gnuradio_swig_py_io_guile" "SWIG_init")
+(load-extension "libguile-gnuradio_swig_py_io" "SWIG_init")
 %}
 #endif
diff --git a/gnuradio-core/src/lib/swig/gnuradio_swig_py_runtime.i b/gnuradio-core/src/lib/swig/gnuradio_swig_py_runtime.i
index f8eff11893..088ae4cf8f 100644
--- a/gnuradio-core/src/lib/swig/gnuradio_swig_py_runtime.i
+++ b/gnuradio-core/src/lib/swig/gnuradio_swig_py_runtime.i
@@ -34,6 +34,6 @@
 
 #if SWIGGUILE
 %scheme %{
-(load-extension "gnuradio_swig_py_runtime_guile" "SWIG_init")
+(load-extension "libguile-gnuradio_swig_py_runtime" "SWIG_init")
 %}
 #endif