From 85be425479c9c1f6b68fff0a61425b41bad71387 Mon Sep 17 00:00:00 2001 From: Juraj Oravec Date: Mon, 13 Feb 2023 23:34:37 +0100 Subject: [PATCH] Fix install issues caused by LICENSE file Signed-off-by: Juraj Oravec --- .gitignore | 1 + CHANGELOG | 3 +++ Makefile | 8 ++++++-- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index c4c4ffc..09473ca 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ *.zip +readability/LICENSE diff --git a/CHANGELOG b/CHANGELOG index 1c6ca79..6a6598b 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +2.0.2 +- Fix install issues caused by LICENSE file + 2.0.1 - Fix version number - Fix toolbar button title text diff --git a/Makefile b/Makefile index 0b5f613..483df57 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ VERSION = 2.0.1 FILES = $(PROJECT)/main.qml FILES += $(PROJECT)/metadata.desktop -FILES += LICENSE +FILES += $(PROJECT)/LICENSE FILES += $(PROJECT)/data/Call.js FILES += $(PROJECT)/data/Readability.js FILES += $(PROJECT)/data/Toolbar.js @@ -22,14 +22,18 @@ IMAGES += $(PROJECT)/images/RM-Type-Controls-Arrow.svg package: build zip -X $(PROJECT)_v$(VERSION).zip $(FILES) +copy_license: + @cp "LICENSE" "$(PROJECT)/LICENSE" + copy_styles: @cp "$(PROJECT)/data/style.orig.css" "$(PROJECT)/data/style.css" -build: copy_styles +build: copy_styles copy_license $(foreach IMG,$(IMAGES), \ $(shell sed -i "s|{$(shell basename "$(IMG)")}|data:$(shell mimetype -b "$(IMG)");base64,$(shell basenc --base64 --wrap=0 "$(IMG)")|g" "$(PROJECT)/data/style.css") \ ) clean: + rm "$(PROJECT)/LICENSE" rm "$(PROJECT)/data/style.css" rm "./$(PROJECT)_v$(VERSION).zip"