From 467abc1096a82e777e2564e27d43183e6c2dae9e Mon Sep 17 00:00:00 2001 From: Radegast Date: Fri, 15 Jun 2012 22:50:24 +0200 Subject: [PATCH] misc: fixed passing arguments to bash scripts, refs #58 --- CMakeLists.txt | 4 ++-- cmake/etl.sh.in | 2 +- cmake/etlded.sh.in | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1cd705cbf..4a7456f14 100644 --- 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 index eb4f63d27..ba5dfb042 100644 --- a/cmake/etl.sh.in +++ b/cmake/etl.sh.in @@ -1,2 +1,2 @@ #!/bin/sh -@CMAKE_INSTALL_PREFIX@/@ETLEGACY_INSTALL_DIRECTORY@/etl \ No newline at end of file +@CMAKE_INSTALL_PREFIX@/@ETLEGACY_INSTALL_DIRECTORY@/etl $@ \ No newline at end of file diff --git a/cmake/etlded.sh.in b/cmake/etlded.sh.in index ec120b55a..732a4cd8e 100644 --- a/cmake/etlded.sh.in +++ b/cmake/etlded.sh.in @@ -1,2 +1,2 @@ #!/bin/sh -@CMAKE_INSTALL_PREFIX@/@ETLEGACY_INSTALL_DIRECTORY@/etlded \ No newline at end of file +@CMAKE_INSTALL_PREFIX@/@ETLEGACY_INSTALL_DIRECTORY@/etlded $@ \ No newline at end of file