From 1e4df5a5420c96dff0a9ece8e96fb49ff2e071e1 Mon Sep 17 00:00:00 2001 From: James Duley Date: Wed, 24 Dec 2014 10:33:26 +1300 Subject: [PATCH] OP-1657 Remove linux bin wrapper: renamed installed symlink to openpilotgcs --- Makefile | 2 +- package/linux/deb_common/rules | 2 +- package/linux/openpilot.desktop | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 2a561a312..a2d3d10f7 100644 --- a/Makefile +++ b/Makefile @@ -954,7 +954,7 @@ install: $(V1) $(MKDIR) -p $(DESTDIR)$(datadir)/applications $(V1) $(MKDIR) -p $(DESTDIR)$(datadir)/pixmaps $(V1) $(MKDIR) -p $(DESTDIR)$(udevdir) - $(V1) $(INSTALL) $(BUILD_DIR)/openpilotgcs_$(GCS_BUILD_CONF)/bin/openpilotgcs $(DESTDIR)$(bindir)/openpilot-gcs + $(V1) $(INSTALL) $(BUILD_DIR)/openpilotgcs_$(GCS_BUILD_CONF)/bin/openpilotgcs $(DESTDIR)$(bindir) $(V1) $(INSTALL) $(BUILD_DIR)/openpilotgcs_$(GCS_BUILD_CONF)/bin/udp_test $(DESTDIR)$(bindir) $(V1) $(INSTALL) $(BUILD_DIR)/openpilotgcs_$(GCS_BUILD_CONF)/lib/openpilotgcs $(DESTDIR)$(libdir) $(V1) $(INSTALL) $(BUILD_DIR)/openpilotgcs_$(GCS_BUILD_CONF)/share/openpilotgcs $(DESTDIR)$(datadir) diff --git a/package/linux/deb_common/rules b/package/linux/deb_common/rules index 1ff03e24e..0977cdeed 100644 --- a/package/linux/deb_common/rules +++ b/package/linux/deb_common/rules @@ -47,7 +47,7 @@ ifdef PACKAGE_DIR else $(error PACKAGE_DIR not defined! $(PACKAGE_DIR)) endif - ln -s /usr/local/OpenPilot/bin/openpilotgcs `pwd`/debian/openpilot/usr/bin/openpilot-gcs + ln -s /usr/local/OpenPilot/bin/openpilotgcs `pwd`/debian/openpilot/usr/bin/openpilotgcs rm -rf debian/openpilot/usr/local/OpenPilot/share/openpilotgcs/sounds/sounds rm -rf debian/openpilot/usr/local/OpenPilot/share/openpilotgcs/pfd/pfd rm -rf debian/openpilot/usr/local/OpenPilot/share/openpilotgcs/models/models diff --git a/package/linux/openpilot.desktop b/package/linux/openpilot.desktop index 5ce67af5d..3a71981c9 100644 --- a/package/linux/openpilot.desktop +++ b/package/linux/openpilot.desktop @@ -2,8 +2,8 @@ Version=0.1.0 Encoding=UTF-8 Name=OpenPilot GCS -Exec=openpilot-gcs -TryExec=openpilot-gcs +Exec=openpilotgcs +TryExec=openpilotgcs Comment=Configure, Tune, Diagnose, Track, & Upgrade FW for OpenPilot solutions Terminal=false Categories=OpenPilotMenu;Qt;Other;