misc: fixed passing arguments to bash scripts, refs #58

etlegacy · Jun 15, 2012 · 467abc1 · 467abc1
1 parent 250b515
commit 467abc1
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -338,14 +338,14 @@ if("${CMAKE_SYSTEM}" MATCHES "Linux")
                 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake/etl.sh.in" "${CMAKE_CURRENT_BINARY_DIR}/etl.sh")
                 install(PROGRAMS "${CMAKE_CURRENT_BINARY_DIR}/etl.sh"
                         RENAME "etl"
-                        DESTINATION "${CMAKE_INSTALL_PREFIX}/bin"
+                        DESTINATION "/usr/bin"
                 )
         endif(BUILD_CLIENT)
         if(BUILD_SERVER)
                 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake/etlded.sh.in" "${CMAKE_CURRENT_BINARY_DIR}/etlded.sh")
                 install(PROGRAMS "${CMAKE_CURRENT_BINARY_DIR}/etlded.sh" 
                         RENAME "etlded"
-                        DESTINATION "${CMAKE_INSTALL_PREFIX}/bin"
+                        DESTINATION "/usr/bin"
                 )
         endif(BUILD_SERVER)
 endif()

diff --git a/cmake/etl.sh.in b/cmake/etl.sh.in
@@ -1,2 +1,2 @@
 #!/bin/sh
-@CMAKE_INSTALL_PREFIX@/@ETLEGACY_INSTALL_DIRECTORY@/etl
+@CMAKE_INSTALL_PREFIX@/@ETLEGACY_INSTALL_DIRECTORY@/etl $@
diff --git a/cmake/etlded.sh.in b/cmake/etlded.sh.in
@@ -1,2 +1,2 @@
 #!/bin/sh
-@CMAKE_INSTALL_PREFIX@/@ETLEGACY_INSTALL_DIRECTORY@/etlded
+@CMAKE_INSTALL_PREFIX@/@ETLEGACY_INSTALL_DIRECTORY@/etlded $@