From b9c174ba8f1f156d788191a75a8b8a9d4c273ea7 Mon Sep 17 00:00:00 2001 From: AsamK Date: Mon, 31 Aug 2015 18:01:55 +0200 Subject: [PATCH] Add BIN_DIR variable to allow packagers to override it --- retroshare-gui/src/retroshare-gui.pro | 2 +- retroshare-nogui/src/retroshare-nogui.pro | 2 +- retroshare.pri | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/retroshare-gui/src/retroshare-gui.pro b/retroshare-gui/src/retroshare-gui.pro index 57a8a88d8..ec967c51a 100644 --- a/retroshare-gui/src/retroshare-gui.pro +++ b/retroshare-gui/src/retroshare-gui.pro @@ -112,7 +112,7 @@ linux-* { } unix { - target.path = "$${PREFIX}/bin" + target.path = "$${BIN_DIR}" INSTALLS += target data_files.path="$${DATA_DIR}/" diff --git a/retroshare-nogui/src/retroshare-nogui.pro b/retroshare-nogui/src/retroshare-nogui.pro index 52dde1f02..9b8136942 100644 --- a/retroshare-nogui/src/retroshare-nogui.pro +++ b/retroshare-nogui/src/retroshare-nogui.pro @@ -58,7 +58,7 @@ linux-* { } unix { - target.path = "$${PREFIX}/bin" + target.path = "$${BIN_DIR}" INSTALLS += target } diff --git a/retroshare.pri b/retroshare.pri index fb20b1984..b85b40cbc 100644 --- a/retroshare.pri +++ b/retroshare.pri @@ -1,5 +1,6 @@ unix { isEmpty(PREFIX) { PREFIX = "/usr" } + isEmpty(BIN_DIR) { BIN_DIR = "$${PREFIX}/bin" } isEmpty(INC_DIR) { INC_DIR = "$${PREFIX}/include/retroshare06" } isEmpty(LIB_DIR) { LIB_DIR = "$${PREFIX}/lib" } isEmpty(DATA_DIR) { DATA_DIR = "$${PREFIX}/share/RetroShare06" }