From 1ec424a0e1adf31a799ace78f58079ecbd975bf9 Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Wed, 18 Jan 2012 11:32:37 -0600 Subject: [PATCH] linuxcncmkdesktop: use right command to invoke linuxcnc --- .../pixmaps/{emc2icon.png => linuxcncicon.png} | Bin emc2icon.png => linuxcncicon.png | Bin scripts/linuxcncmkdesktop.in | 6 +++--- 3 files changed, 3 insertions(+), 3 deletions(-) rename debian/extras/usr/share/pixmaps/{emc2icon.png => linuxcncicon.png} (100%) rename emc2icon.png => linuxcncicon.png (100%) diff --git a/debian/extras/usr/share/pixmaps/emc2icon.png b/debian/extras/usr/share/pixmaps/linuxcncicon.png similarity index 100% rename from debian/extras/usr/share/pixmaps/emc2icon.png rename to debian/extras/usr/share/pixmaps/linuxcncicon.png diff --git a/emc2icon.png b/linuxcncicon.png similarity index 100% rename from emc2icon.png rename to linuxcncicon.png diff --git a/scripts/linuxcncmkdesktop.in b/scripts/linuxcncmkdesktop.in index e3fa6704d63..a6bcdad82d0 100644 --- a/scripts/linuxcncmkdesktop.in +++ b/scripts/linuxcncmkdesktop.in @@ -2,10 +2,10 @@ EMC_BIN_DIR=@EMC2_BIN_DIR@ EMC_SCRIPT_DIR=@EMC2_HOME@/scripts -if [ -x $EMC_BIN_DIR/emc ]; then - EMC=$EMC_BIN_DIR/emc +if [ -x $EMC_BIN_DIR/linuxcnc ]; then + EMC=$EMC_BIN_DIR/linuxcnc else - EMC=$EMC_SCRIPT_DIR/emc + EMC=$EMC_SCRIPT_DIR/linuxcnc fi cat <