From 96e93e5c504fa62a775e6befcec2cda4c69bac1c Mon Sep 17 00:00:00 2001
From: Shahram Najm <masn@ecmwf.int>
Date: Thu, 18 Dec 2014 11:03:45 +0000
Subject: [PATCH] CMake install: related to GRIB-613

---
 definitions/CMakeLists.txt | 5 ++++-
 python/CMakeLists.txt      | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/definitions/CMakeLists.txt b/definitions/CMakeLists.txt
index 6a465bffa..be32e01f5 100644
--- a/definitions/CMakeLists.txt
+++ b/definitions/CMakeLists.txt
@@ -5,6 +5,9 @@ install( FILES ${definition_files} ${table_files}
          DESTINATION share/${PROJECT_NAME}/definitions
          PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ )
 
+install( FILES installDefinitions.sh
+         DESTINATION share/${PROJECT_NAME}/definitions)
+
 install(  DIRECTORY budg bufr cdf common grib1 grib2 gts mars metar taf tide hdf5 wrap
           DESTINATION share/${PROJECT_NAME}/definitions
           FILES_MATCHING 
@@ -20,7 +23,7 @@ install(  DIRECTORY budg bufr cdf common grib1 grib2 gts mars metar taf tide hdf
 file(    COPY ${definition_files} ${table_files}
          DESTINATION ${CMAKE_BINARY_DIR}/share/${PROJECT_NAME}/definitions )
 
-file(     COPY budg cdf common grib1 grib2 gts mars metar taf tide hdf5 wrap
+file(     COPY budg bufr cdf common grib1 grib2 gts mars metar taf tide hdf5 wrap
           DESTINATION ${CMAKE_BINARY_DIR}/share/${PROJECT_NAME}/definitions
           FILES_MATCHING
           PATTERN "*.def"
diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
index 30bea5c07..fee492ba8 100644
--- a/python/CMakeLists.txt
+++ b/python/CMakeLists.txt
@@ -54,7 +54,7 @@ if( HAVE_PYTHON )
 
         swig_link_libraries( gribapi_swig grib_api ${PYTHON_LIBRARIES} )
 
-        set(PYTHON_DEST "lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages" )
+        set(PYTHON_DEST "lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages/grib_api" )
 
         install(TARGETS _gribapi_swig DESTINATION ${PYTHON_DEST} )