diff options
| author | Matt Ettus | 2009-09-24 22:34:06 -0700 |
|---|---|---|
| committer | Matt Ettus | 2009-09-24 22:34:06 -0700 |
| commit | 5c46578ba936de57e80594540804c964aa408f73 (patch) | |
| tree | cf164f8e3d80b78971fb2987740b7d957ee1f306 /grc/Makefile.inc | |
| parent | 35ada01aa8ae838d6d75bf063725218fa7e18f5f (diff) | |
| parent | 16474a0adb44dc81a8338a9c4a9a6dcab6f6328f (diff) | |
| download | gnuradio-5c46578ba936de57e80594540804c964aa408f73.tar.gz gnuradio-5c46578ba936de57e80594540804c964aa408f73.tar.bz2 gnuradio-5c46578ba936de57e80594540804c964aa408f73.zip | |
Merge commit 'origin' into new_eth
Conflicts:
.gitignore
Diffstat (limited to 'grc/Makefile.inc')
| -rw-r--r-- | grc/Makefile.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/grc/Makefile.inc b/grc/Makefile.inc index 96ee11b67..c45d1ce1f 100644 --- a/grc/Makefile.inc +++ b/grc/Makefile.inc @@ -1,5 +1,5 @@ # -# Copyright 2008 Free Software Foundation, Inc. +# Copyright 2008, 2009 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -20,5 +20,5 @@ # include $(top_srcdir)/Makefile.common -grc_src_prefix = $(pythondir)/gnuradio/grc +grc_src_prefix = $(pkgpythondir)/grc grc_blocksdir = $(pkgdatadir)/grc/blocks |