[hamradio-commits] [gnss-sdr] 105/303: Some minor fixes for packaging

[Carles Fernandez]

This is an automated email from the git hooks/post-receive script.

carles_fernandez-guest pushed a commit to branch master
in repository gnss-sdr.

commit a30bf16abf53bef969cfe2740525413273fa7acf
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date:   Sun Oct 16 08:13:18 2016 +0200

    Some minor fixes for packaging
    
    See https://github.com/gnuradio/volk/pull/100
---
 .../volk_gnsssdr/include/volk_gnsssdr/constants.h           | 10 +++++-----
 .../volk_gnsssdr_module/volk_gnsssdr/lib/CMakeLists.txt     |  2 +-
 .../volk_gnsssdr_module/volk_gnsssdr/lib/constants.c.in     | 13 ++++++++-----
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/include/volk_gnsssdr/constants.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/include/volk_gnsssdr/constants.h
index 2ee2b11..066f8d6 100644
--- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/include/volk_gnsssdr/constants.h
+++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/include/volk_gnsssdr/constants.h
@@ -28,11 +28,11 @@
 
 __VOLK_DECL_BEGIN
 
-VOLK_API char* volk_gnsssdr_prefix();
-VOLK_API char* volk_gnsssdr_version();
-VOLK_API char* volk_gnsssdr_c_compiler();
-VOLK_API char* volk_gnsssdr_compiler_flags();
-VOLK_API char* volk_gnsssdr_available_machines();
+VOLK_API const char* volk_gnsssdr_prefix();
+VOLK_API const char* volk_gnsssdr_version();
+VOLK_API const char* volk_gnsssdr_c_compiler();
+VOLK_API const char* volk_gnsssdr_compiler_flags();
+VOLK_API const char* volk_gnsssdr_available_machines();
 
 __VOLK_DECL_END
 
diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/CMakeLists.txt b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/CMakeLists.txt
index d512c3d..528f11e 100644
--- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/CMakeLists.txt
+++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/CMakeLists.txt
@@ -499,7 +499,7 @@ endif()
 message(STATUS "Loading version ${VERSION} into constants...")
 
 #double escape for windows backslash path separators
-string(REPLACE "\\" "\\\\" prefix ${prefix})
+string(REPLACE "\\" "\\\\" prefix "${prefix}")
 
 configure_file(
     ${CMAKE_CURRENT_SOURCE_DIR}/constants.c.in
diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/constants.c.in b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/constants.c.in
index daa086f..a28fdc3 100644
--- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/constants.c.in
+++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/constants.c.in
@@ -21,33 +21,36 @@
 #include <config.h>
 #endif
 
+#include <stdlib.h>
 #include <volk_gnsssdr/constants.h>
 
-char*
+const char*
 volk_gnsssdr_prefix()
 {
+  const char *prefix = getenv("VOLK_GNSSSDR_PREFIX");
+  if (prefix != NULL) return prefix;
   return "@prefix@";
 }
 
-char*
+const char*
 volk_gnsssdr_version()
 {
   return "@VERSION@";
 }
 
-char*
+const char*
 volk_gnsssdr_c_compiler()
 {
   return "@cmake_c_compiler_version@";
 }
 
-char*
+const char*
 volk_gnsssdr_compiler_flags()
 {
   return "@COMPILER_INFO@";
 }
 
-char*
+const char*
 volk_gnsssdr_available_machines()
 {
   return "@available_machines@";

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/gnss-sdr.git