aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormitchell <70453897+667e-11@users.noreply.github.com>2017-04-20 11:20:13 -0400
committermitchell <70453897+667e-11@users.noreply.github.com>2017-04-20 11:20:13 -0400
commit67c0e39f13140f3eec3a1a9d04610278462cce98 (patch)
tree2436fc11500ad8105cf12e8beabb79e28ef2689f
parent07b65e2f1f6bd213b98b52d3a1098cfd2fe2e6c6 (diff)
downloadtextadept-67c0e39f13140f3eec3a1a9d04610278462cce98.tar.gz
textadept-67c0e39f13140f3eec3a1a9d04610278462cce98.zip
Fixed .desktop file icon path issue caused by r2318; src/Makefile
-rw-r--r--src/Makefile5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/Makefile b/src/Makefile
index f0c7fc36..82dbbee3 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -76,7 +76,6 @@ else
bin_dir = $(PREFIX)/bin
data_dir = $(PREFIX)/share/textadept
XDG_DATA_DIR ?= $(PREFIX)/share/applications
- svg_file = $(data_dir)/core/images/textadept.svg
desktop_files := $(wildcard *.desktop)
ifeq (, $(findstring curses, $(MAKECMDGOALS)))
plat_flag = -DGTK
@@ -278,8 +277,8 @@ install: $(install_targets) | ../core ../doc ../init.lua ../lexers ../LICENSE \
if [ -d "$(XDG_DATA_DIR)" ]; then \
install -d $(DESTDIR)$(XDG_DATA_DIR); \
for desktop_file in $(desktop_files); do \
- sed -e 's|Icon=textadept.svg|Icon=$(svg_file)|' $$desktop_file > \
- $(DESTDIR)$(XDG_DATA_DIR)/$$desktop_file; \
+ sed -e 's|Icon=textadept|Icon=$(data_dir)/core/images/textadept|' \
+ $$desktop_file > $(DESTDIR)$(XDG_DATA_DIR)/$$desktop_file; \
done; \
fi
uninstall: