diff --git a/QGCExternalLibs.pri b/QGCExternalLibs.pri
index d8fceca..e2b1926 100644
--- a/QGCExternalLibs.pri
+++ b/QGCExternalLibs.pri
@@ -246,11 +246,19 @@ contains (DEFINES, DISABLE_AIRMAP) {
             !exists("$${AIRMAP_PLATFORM_SDK_PATH}/include/airmap") {
                 system("mkdir -p $${AIRMAP_PLATFORM_SDK_PATH}/include/airmap")
             }
-            system("wget -q -O $${AIRMAP_PLATFORM_SDK_FILENAME} $${AIRMAP_PLATFORM_SDK_URL} && dpkg -x $${AIRMAP_PLATFORM_SDK_FILENAME} $${AIRMAP_PLATFORM_SDK_PATH}/")
-            system("mv $${AIRMAP_PLATFORM_SDK_PATH}/$${AIRMAP_PLATFORM_SDK_INSTALL_PREFIX}/lib/* $${AIRMAP_PLATFORM_SDK_PATH}/linux/$${AIRMAP_QT_PATH}/")
-            system("mv $${AIRMAP_PLATFORM_SDK_PATH}/$${AIRMAP_PLATFORM_SDK_INSTALL_PREFIX}/include/airmap/* $${AIRMAP_PLATFORM_SDK_PATH}/include/airmap/")
-            system("rm -rf $${AIRMAP_PLATFORM_SDK_PATH}/$${AIRMAP_PLATFORM_SDK_INSTALL_PREFIX}")
-            system("rm $${AIRMAP_PLATFORM_SDK_FILENAME}")
+
+            airmap_platform_sdk_install.target = install_airmap_platform_sdk
+            airmap_platform_sdk_install.depends = FORCE
+            airmap_platform_sdk_install.commands = \
+                (wget -q -O "$${AIRMAP_PLATFORM_SDK_FILENAME} $${AIRMAP_PLATFORM_SDK_URL}" && dpkg -x "$${AIRMAP_PLATFORM_SDK_FILENAME} $${AIRMAP_PLATFORM_SDK_PATH}"/) && \
+                (mv "$${AIRMAP_PLATFORM_SDK_PATH}/$${AIRMAP_PLATFORM_SDK_INSTALL_PREFIX}/lib/*" "$${AIRMAP_PLATFORM_SDK_PATH}/linux/$${AIRMAP_QT_PATH}"/) && \
+                (mv "$${AIRMAP_PLATFORM_SDK_PATH}/$${AIRMAP_PLATFORM_SDK_INSTALL_PREFIX}/include/airmap/*" "$${AIRMAP_PLATFORM_SDK_PATH}/include/airmap/")
+            airmap_platform_sdk_install.clean_commands = \
+                (rm -rf "$${AIRMAP_PLATFORM_SDK_PATH}/$${AIRMAP_PLATFORM_SDK_INSTALL_PREFIX}") && \
+                (rm "$${AIRMAP_PLATFORM_SDK_FILENAME}")
+
+            QMAKE_EXTRA_TARGETS += airmap_platform_sdk_install
+            PRE_TARGETDEPS += $$airmap_platform_sdk_install.target
 
             exists($${AIRMAP_PLATFORM_SDK_PATH}/linux/$$AIRMAP_QT_PATH) {
                 message("Including support for AirMap for Linux")
diff --git a/QGCPostLinkCommon.pri b/QGCPostLinkCommon.pri
index 19e6933..65fe08a 100644
--- a/QGCPostLinkCommon.pri
+++ b/QGCPostLinkCommon.pri
@@ -146,7 +146,7 @@ LinuxBuild {
 
     # Airmap
     contains (DEFINES, QGC_AIRMAP_ENABLED) {
-        QMAKE_POST_LINK += && $$QMAKE_COPY $$PWD/libs/airmapd/linux/$$AIRMAP_QT_PATH/libairmap-qt.so.0.0.1 $$DESTDIR/Qt/libs/
+        QMAKE_POST_LINK += && $$QMAKE_COPY $$OUT_PWD/libs/airmapd/linux/$$AIRMAP_QT_PATH/libairmap-qt.so.0.0.1 $$DESTDIR/Qt/libs/
     }
 
     # QGroundControl start script