From e1ad6cfd49029c5f27f362be2d787e0ed1c490c6 Mon Sep 17 00:00:00 2001 From: mitchell <70453897+667e-11@users.noreply.github.com> Date: Sun, 30 Apr 2017 19:47:57 -0400 Subject: Install Textadept icons to /usr/share/pixmaps; src/Makefile --- src/Makefile | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/Makefile b/src/Makefile index b8eff26f..7f4ec910 100644 --- a/src/Makefile +++ b/src/Makefile @@ -76,6 +76,7 @@ else bin_dir = $(PREFIX)/bin data_dir = $(PREFIX)/share/textadept XDG_DATA_DIR ?= $(PREFIX)/share/applications + PIXMAPS_DIR ?= /usr/share/pixmaps desktop_files := $(wildcard *.desktop) ifeq (, $(findstring curses, $(MAKECMDGOALS))) plat_flag = -DGTK @@ -276,16 +277,20 @@ install: $(install_targets) | ../core ../doc ../init.lua ../lexers ../LICENSE \ ln -s $(subst .., $(data_dir), $^) $(DESTDIR)$(bin_dir) if [ -d "$(XDG_DATA_DIR)" ]; then \ install -d $(DESTDIR)$(XDG_DATA_DIR); \ - for desktop_file in $(desktop_files); do \ - sed -e 's|Icon=textadept|Icon=$(data_dir)/core/images/textadept|' \ - $$desktop_file > $(DESTDIR)$(XDG_DATA_DIR)/$$desktop_file; \ - done; \ + install -t $(DESTDIR)$(XDG_DATA_DIR) $(desktop_files); \ + fi + if [ -d "$(PIXMAPS_DIR)" ]; then \ + install -d $(DESTDIR)$(PIXMAPS_DIR); \ + ln -s $(data_dir)/core/images/textadept.svg $(DESTDIR)$(PIXMAPS_DIR); \ + ln -s $(data_dir)/core/images/ta_48x48.png \ + $(DESTDIR)$(PIXMAPS_DIR)/textadept.png; \ fi uninstall: rm -r $(DESTDIR)$(bin_dir)/textadept* $(DESTDIR)$(data_dir) if [ -d "$(XDG_DATA_DIR)" ]; then \ rm $(DESTDIR)$(XDG_DATA_DIR)/textadept*.desktop; \ fi + if [ -d "$(PIXMAPS_DIR)" ]; then rm $(DESTDIR)$(PIXMAPS_DIR)/textadept*; fi # Clean. @@ -403,7 +408,7 @@ endif scintilla_tgz = scintilla373.tgz tre_zip = cdce45e8dd7a3b36954022b4a4d3570e1ac5a4f8.zip scinterm_zip = scinterm_1.8.zip -scintillua_zip = scintillua-3.7.4-1.zip +scintillua_zip = scintillua_3.7.4-1.zip lua_tgz = lua-5.3.4.tar.gz lpeg_tgz = lpeg-1.0.0.tar.gz lfs_zip = v_1_6_3.zip -- cgit v1.2.3