From 532feb76f746c5118504036566d7db1dfe9a6b81 Mon Sep 17 00:00:00 2001
From: Kubat <mael.martin31@gmail.com>
Date: Fri, 5 Feb 2021 18:05:58 +0100
Subject: [PATCH] WIP: Fix AppImage generation

---
 Makefile.am | 7 ++-----
 Makefile.in | 7 ++-----
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index c80cb052..67dff73a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,17 +18,14 @@ appimage-common: install
 appimage-lektord: install appimage-common
 	$(LKT_LINUXDEPLOY) --appdir $(APPDIR) --executable @MKVPROPEDIT@
 if LKT_KLKT
-	$(LKT_LINUXDEPLOY) --appdir $(APPDIR)                            \
-		--desktop-file $(top_srcdir)/utils/desktop/klkt.desktop      \
-		--icon-file AppImage/lektor.png                              \
-		--executable $(bindir)/klkt
+	$(LKT_LINUXDEPLOY) --appdir $(APPDIR) --executable $(bindir)/klkt
 	EXTRA_QT_PLUGINS=xcb $(LKT_LINUXDEPLOYQT) --appdir $(APPDIR)
 endif
 	$(LKT_LINUXDEPLOY) --appdir $(APPDIR)                            \
 		--desktop-file $(top_srcdir)/utils/desktop/lektord.desktop   \
 		--icon-file AppImage/lektor.png                              \
 		--executable $(bindir)/lektord
-	cp -rf $(top_srcdir)/utils/licenses AppImage/lektord/usr/share/
+	cp -rf $(top_srcdir)/utils/licenses $(APPDIR)/usr/share/
 	$(LKT_APPIMAGETOOL) $(APPDIR)
 
 appimage-lkt: install appimage-common
diff --git a/Makefile.in b/Makefile.in
index fdf771ee..226fe918 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -972,16 +972,13 @@ uninstall-am: uninstall-binSCRIPTS
 
 @LKT_APPIMAGE_TRUE@appimage-lektord: install appimage-common
 @LKT_APPIMAGE_TRUE@	$(LKT_LINUXDEPLOY) --appdir $(APPDIR) --executable @MKVPROPEDIT@
-@LKT_APPIMAGE_TRUE@@LKT_KLKT_TRUE@	$(LKT_LINUXDEPLOY) --appdir $(APPDIR)                            \
-@LKT_APPIMAGE_TRUE@@LKT_KLKT_TRUE@		--desktop-file $(top_srcdir)/utils/desktop/klkt.desktop      \
-@LKT_APPIMAGE_TRUE@@LKT_KLKT_TRUE@		--icon-file AppImage/lektor.png                              \
-@LKT_APPIMAGE_TRUE@@LKT_KLKT_TRUE@		--executable $(bindir)/klkt
+@LKT_APPIMAGE_TRUE@@LKT_KLKT_TRUE@	$(LKT_LINUXDEPLOY) --appdir $(APPDIR) --executable $(bindir)/klkt
 @LKT_APPIMAGE_TRUE@@LKT_KLKT_TRUE@	EXTRA_QT_PLUGINS=xcb $(LKT_LINUXDEPLOYQT) --appdir $(APPDIR)
 @LKT_APPIMAGE_TRUE@	$(LKT_LINUXDEPLOY) --appdir $(APPDIR)                            \
 @LKT_APPIMAGE_TRUE@		--desktop-file $(top_srcdir)/utils/desktop/lektord.desktop   \
 @LKT_APPIMAGE_TRUE@		--icon-file AppImage/lektor.png                              \
 @LKT_APPIMAGE_TRUE@		--executable $(bindir)/lektord
-@LKT_APPIMAGE_TRUE@	cp -rf $(top_srcdir)/utils/licenses AppImage/lektord/usr/share/
+@LKT_APPIMAGE_TRUE@	cp -rf $(top_srcdir)/utils/licenses $(APPDIR)/usr/share/
 @LKT_APPIMAGE_TRUE@	$(LKT_APPIMAGETOOL) $(APPDIR)
 
 @LKT_APPIMAGE_TRUE@appimage-lkt: install appimage-common
-- 
GitLab