Merge branch 'upstream' into dfsg-orig

[debian/gnuradio] / gnuradio-core / src / python / gnuradio / gr / prefs.py

diff --git a/gnuradio-core/src/python/gnuradio/gr/prefs.py b/gnuradio-core/src/python/gnuradio/gr/prefs.py
index 52f1ff64a6637b2b55014b251f9e68fe4b65e40f..9b31b772b3f4fb72c05905326a8078662180c2b8 100644 (file)
--- a/gnuradio-core/src/python/gnuradio/gr/prefs.py
+++ b/gnuradio-core/src/python/gnuradio/gr/prefs.py
@@ -33,7 +33,7 @@ def _user_prefs_filename():
     return os.path.expanduser('~/.gnuradio/config.conf')
         
 def _sys_prefs_dirname():
-    return os.path.join(gsp.prefix(), 'etc/gnuradio/conf.d')
+    return gsp.prefsdir()
 
 def _bool(x):
     """