From 22db0d87855d216d6c3840630683501cb12fa836 Mon Sep 17 00:00:00 2001 From: peabody124 Date: Mon, 27 Sep 2010 07:48:26 +0000 Subject: [PATCH] Ground/Share: Sorry, writing it more elegantly. Tired. git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@1780 ebee16cc-31ac-478f-84a7-5cbb03baadba --- ground/share/share.pro | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/ground/share/share.pro b/ground/share/share.pro index 871ec78d0..b189debad 100644 --- a/ground/share/share.pro +++ b/ground/share/share.pro @@ -7,15 +7,9 @@ DATACOLLECTIONS = dials models pfd sounds diagrams mapicons equals(copydata, 1) { for(dir, DATACOLLECTIONS) { - macx{ - exists($$GCS_SOURCE_TREE/share/openpilotgcs/$$dir) { - data_copy.commands += $(COPY_DIR) $$targetPath(\"$$GCS_SOURCE_TREE/share/openpilotgcs/$$dir\") $$targetPath(\"$$GCS_DATA_PATH/\") $$addNewline() - } - } - !macx{ - exists($$GCS_SOURCE_TREE/share/openpilotgcs/$$dir) { - data_copy.commands += $(COPY_DIR) $$targetPath(\"$$GCS_SOURCE_TREE/share/openpilotgcs/$$dir\") $$targetPath(\"$$GCS_DATA_PATH/$$dir\") $$addNewline() - } + exists($$GCS_SOURCE_TREE/share/openpilotgcs/$$dir) { + macx:data_copy.commands += $(COPY_DIR) $$targetPath(\"$$GCS_SOURCE_TREE/share/openpilotgcs/$$dir\") $$targetPath(\"$$GCS_DATA_PATH/\") $$addNewline() + !macxdata_copy.commands += $(COPY_DIR) $$targetPath(\"$$GCS_SOURCE_TREE/share/openpilotgcs/$$dir\") $$targetPath(\"$$GCS_DATA_PATH/$$dir\") $$addNewline() } } data_copy.target = FORCE