Merge commit 'v3.3.0' into upstream

[debian/gnuradio] / grc / gui / Makefile.am

diff --git a/grc/gui/Makefile.am b/grc/gui/Makefile.am
index cb45d535992e208b4e2144e913b83d7be8a5fe7f..a73b6855dc5514fde4b0c1e174cfb08da78cf9b1 100644 (file)
--- a/grc/gui/Makefile.am
+++ b/grc/gui/Makefile.am
@@ -19,9 +19,9 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-include $(top_srcdir)/grc/Makefile.inc
+include $(top_srcdir)/Makefile.common
 
-ourpythondir = $(grc_src_prefix)/gui
+ourpythondir = $(pkgpythondir)/grc/gui
 ourpython_PYTHON = \
        Block.py \
        Colors.py \
@@ -43,7 +43,7 @@ ourpython_PYTHON = \
        MainWindow.py \
        Messages.py \
        NotebookPage.py \
-       ParamsDialog.py \
+       PropsDialog.py \
        Preferences.py \
        StateCache.py \
        __init__.py