From 11beba33695062fd05ff989535e165777af0ac6f Mon Sep 17 00:00:00 2001 From: James Duley Date: Sat, 9 May 2015 20:04:23 +1200 Subject: [PATCH] OP-1879 remove openpilot hardcoding: use GCS_APP_TARGET name for library and data paths --- ground/openpilotgcs/openpilotgcs.pri | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ground/openpilotgcs/openpilotgcs.pri b/ground/openpilotgcs/openpilotgcs.pri index 76e2e32f5..91b352503 100644 --- a/ground/openpilotgcs/openpilotgcs.pri +++ b/ground/openpilotgcs/openpilotgcs.pri @@ -141,9 +141,9 @@ macx { GCS_APP_TARGET = openpilotgcs GCS_PATH = $$GCS_BUILD_TREE GCS_APP_PATH = $$GCS_PATH/bin - GCS_LIBRARY_PATH = $$GCS_PATH/lib/openpilotgcs + GCS_LIBRARY_PATH = $$GCS_PATH/lib/$$GCS_APP_TARGET GCS_PLUGIN_PATH = $$GCS_LIBRARY_PATH/plugins - GCS_DATA_PATH = $$GCS_PATH/share/openpilotgcs + GCS_DATA_PATH = $$GCS_PATH/share/$$GCS_APP_TARGET GCS_DOC_PATH = $$GCS_PATH/share/doc !isEqual(GCS_SOURCE_TREE, $$GCS_BUILD_TREE):copydata = 1