From 7b81ba1688de2f4014159027bc5083cdf988921e Mon Sep 17 00:00:00 2001 From: Roman Demidov Date: Fri, 2 Aug 2024 12:16:43 +0300 Subject: [PATCH] Fix bug 69294 : Incorrect application icon --- win-linux/package/linux/Makefile | 1 + win-linux/package/linux/common/desktopeditors.sh.m4 | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/win-linux/package/linux/Makefile b/win-linux/package/linux/Makefile index 5c995b84c..a1591cf52 100644 --- a/win-linux/package/linux/Makefile +++ b/win-linux/package/linux/Makefile @@ -140,6 +140,7 @@ build : $(LINUX_DEPS) mkdir -p $@/main/opt/$(DESKTOPEDITORS_PREFIX) cp -rft $@/main/opt/$(DESKTOPEDITORS_PREFIX) $(SOURCE_DIR)/desktopeditors/* chmod 755 $@/main/opt/$(DESKTOPEDITORS_PREFIX)/DesktopEditors + ln -s DesktopEditors $@/main/opt/$(DESKTOPEDITORS_PREFIX)/$(DESKTOPEDITORS_EXEC) cp -rf $(BRANDING_DIR)/../../../common/package/license/*.htm \ $@/main/opt/$(DESKTOPEDITORS_PREFIX)/LICENSE.htm diff --git a/win-linux/package/linux/common/desktopeditors.sh.m4 b/win-linux/package/linux/common/desktopeditors.sh.m4 index 9c241c372..faccffdab 100644 --- a/win-linux/package/linux/common/desktopeditors.sh.m4 +++ b/win-linux/package/linux/common/desktopeditors.sh.m4 @@ -133,4 +133,4 @@ export LD_LIBRARY_PATH=$DIR$LDLPATH, DIR_MV=/opt/M4_MEDIAVIEWER_PREFIX export LD_LIBRARY_PATH=$DIR:$DIR/converter:$DIR_MV$LDLPATH export VLC_PLUGIN_PATH=$DIR_MV/plugins) -exec $DIR/DesktopEditors "$@" +exec $DIR/M4_DESKTOPEDITORS_EXEC "$@"