diff options
| author | Johnathan Corgan | 2012-02-14 12:32:52 -0800 |
|---|---|---|
| committer | Johnathan Corgan | 2012-02-14 12:34:47 -0800 |
| commit | f0a1631dad755d5abf28351f07b2bbf7773b37b8 (patch) | |
| tree | 397b02568ddbab1f85646afdd06aee6fd540c99c /grc/freedesktop | |
| parent | ef1748e4efc40cc065fb5f1b40d710256dd37efa (diff) | |
| parent | dc266ca38bdc59955f8c8d8a98291f078d7f4377 (diff) | |
| download | gnuradio-f0a1631dad755d5abf28351f07b2bbf7773b37b8.tar.gz gnuradio-f0a1631dad755d5abf28351f07b2bbf7773b37b8.tar.bz2 gnuradio-f0a1631dad755d5abf28351f07b2bbf7773b37b8.zip | |
Merge branch 'master' into safe_align
Conflicts:
gnuradio-core/src/lib/filter/gr_fft_filter_ccc.cc
gnuradio-core/src/lib/filter/gr_fft_filter_fff.cc
Diffstat (limited to 'grc/freedesktop')
| -rw-r--r-- | grc/freedesktop/CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/grc/freedesktop/CMakeLists.txt b/grc/freedesktop/CMakeLists.txt index 8c0f53d9f..492b0f7d8 100644 --- a/grc/freedesktop/CMakeLists.txt +++ b/grc/freedesktop/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright 2011 Free Software Foundation, Inc. +# Copyright 2011-2012 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -41,7 +41,7 @@ if(UNIX AND HAVE_XDG_UTILS) ${CMAKE_CURRENT_BINARY_DIR}/grc_setup_freedesktop @ONLY) install( - FILES ${CMAKE_CURRENT_BINARY_DIR}/grc_setup_freedesktop + PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/grc_setup_freedesktop DESTINATION ${GR_PKG_LIBEXEC_DIR} COMPONENT "grc" ) endif(UNIX AND HAVE_XDG_UTILS) |