[SCM] csound/master: Override *_MODULE_INSTALL_DIR to set it to global install dir

[fsateler at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit fa6086001c9147fbebb8e670896b60ab65396f31
Author: Felipe Sateler <fsateler at debian.org>
Date:   Mon Jul 17 16:37:06 2017 -0400

    Override *_MODULE_INSTALL_DIR to set it to global install dir

diff --git a/debian/patches/Allow-overriding-_MODULE_INSTALL_DIR.patch b/debian/patches/Allow-overriding-_MODULE_INSTALL_DIR.patch
new file mode 100644
index 0000000..0369def
--- /dev/null
+++ b/debian/patches/Allow-overriding-_MODULE_INSTALL_DIR.patch
@@ -0,0 +1,92 @@
+From: Felipe Sateler <fsateler at debian.org>
+Date: Mon, 17 Jul 2017 16:33:44 -0400
+Subject: Allow overriding {PYTHON,JAVA,LUA}_MODULE_INSTALL_DIR
+
+---
+ CMakeLists.txt | 22 ++++++++++++----------
+ 1 file changed, 12 insertions(+), 10 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f97541b..6013c93 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -221,11 +221,13 @@ endif()
+ execute_process (
+      COMMAND python -c
+      "import site, sys; sys.stdout.write(site.getusersitepackages())"
+-     OUTPUT_VARIABLE PYTHON_MODULE_INSTALL_DIR
++     OUTPUT_VARIABLE PYTHON_USER_SITE_PACKAGES
+    )
+ 
+-set(JAVA_MODULE_INSTALL_DIR ${LIBRARY_INSTALL_DIR})
+-set(LUA_MODULE_INSTALL_DIR ${LIBRARY_INSTALL_DIR})
++SET(PYTHON_MODULE_INSTALL_DIR ${PYTHON_USER_SITE_PACKAGES} CACHE PATH "Python module install dir")
++
++set(JAVA_MODULE_INSTALL_DIR ${LIBRARY_INSTALL_DIR} CACHE PATH "Java module install dir")
++set(LUA_MODULE_INSTALL_DIR ${LIBRARY_INSTALL_DIR} CACHE PATH "Lua module install dir")
+ 
+ # VL this is breaking CUDA compilation. It's not necessary
+ #if(APPLE)
+@@ -242,7 +244,7 @@ if(WIN32 AND NOT MSVC)
+     set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--add-stdcall-alias")
+ endif()
+ 
+-if(MSVC) 
++if(MSVC)
+   include_directories(${PROJECT_SOURCE_DIR}/msvc/include)
+   set(CMAKE_REQUIRED_INCLUDES "${PROJECT_SOURCE_DIR}/msvc/include;${PROJECT_SOURCE_DIR}/msvc/deps/include")
+ endif()
+@@ -347,7 +349,7 @@ message(STATUS "Building for OSX")
+     set(VECLIB_PATH "/System/Library/Frameworks/")
+   endif()
+  endif()
+-   
++
+ endif()
+ 
+ if(USE_DOUBLE)
+@@ -466,7 +468,7 @@ endif()
+ if(NOT MSVC AND REQUIRE_PTHREADS)
+   # Use ladder of if's to support older CMake versions (i.e., travis)
+   find_library(PTHREAD_LIBRARY winpthread-1)
+-  if(NOT PTHREAD_LIBRARY) 
++  if(NOT PTHREAD_LIBRARY)
+     find_library(PTHREAD_LIBRARY pthread)
+   endif()
+   if(NOT PTHREAD_LIBRARY)
+@@ -829,7 +831,7 @@ set(mp3in_SRCS
+     InOut/libmpadec/tables.c
+     InOut/libmpadec/mpadec.c
+     InOut/libmpadec/mp3dec.c)
+-    
++
+ list(APPEND libcsound_SRCS ${stdopcod_SRCS} ${cs_pvs_ops_SRCS} ${oldpvoc_SRCS} ${mp3in_SRCS})
+ 
+ if(INIT_STATIC_MODULES)
+@@ -889,7 +891,7 @@ set_source_files_properties(${YACC_OUTH} GENERATED)
+ set_source_files_properties(${LEX_OUT} GENERATED)
+ set_source_files_properties(${PRELEX_OUT} GENERATED)
+ 
+-if(MSVC) 
++if(MSVC)
+   set_source_files_properties(${LEX_OUT} PROPERTIES
+     COMPILE_FLAGS -DYY_NO_UNISTD_H)
+   set_source_files_properties(${PRELEX_OUT} PROPERTIES
+@@ -939,7 +941,7 @@ list(APPEND libcsound_SRCS ${PRELEX_SCOOUT})
+ #set_source_files_properties(${YACC_SCOOUT} GENERATED)
+ #set_source_files_properties(${LEX_SCOOUT} GENERATED)
+ set_source_files_properties(${PRELEX_SCOOUT} GENERATED)
+-if(MSVC) 
++if(MSVC)
+   set_source_files_properties(${PRELEX_SCOOUT} PROPERTIES
+     COMPILE_FLAGS -DYY_NO_UNISTD_H)
+ endif()
+@@ -1340,7 +1342,7 @@ set (CPACK_PACKAGE_VERSION_MINOR "0")
+ set (CPACK_PACKAGE_VERSION_PATCH "0")
+ include (CPack)
+ 
+-# Documentation 
++# Documentation
+ find_package(Doxygen)
+ if(DOXYGEN_FOUND)
+     configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.doxygen
diff --git a/debian/patches/series b/debian/patches/series
index 540bb9c..919069e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 debian-specific/lua-link.diff
+Allow-overriding-_MODULE_INSTALL_DIR.patch
diff --git a/debian/rules b/debian/rules
index 14d1513..f285c9f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -37,6 +37,9 @@ DEB_CMAKE_EXTRA_FLAGS = \
 	-DBUILD_MULTI_CORE=ON \
 	-DBUILD_TESTS=ON \
 	-DUSE_COMPILER_OPTIMIZATIONS=OFF \
+	-DPYTHON_MODULE_INSTALL_DIR=/usr/lib/python2.7/dist-packages \
+	-DJAVA_MODULE_INSTALL_DIR=/usr/lib \
+	-DLUA_MODULE_INSTALL_DIR=/usr/lib/lua/5.1/ \
 
 ifneq "$(filter amd64 i386, $(DEB_HOST_ARCH_CPU))" ""
 	DEB_CMAKE_EXTRA_FLAGS += -DUSE_ATOMIC_BUILTIN=ON

-- 
csound packaging