diff options
| author |   mitchell <70453897+667e-11@users.noreply.github.com> | 2016-11-01 09:35:20 -0400 |
|---|---|---|
| committer | mitchell <70453897+667e-11@users.noreply.github.com> | 2016-11-01 09:35:20 -0400 |
| commit | b965beae414d95a8382539f92f891b073edc5fcd (patch) | |
| tree | a2242a5add3d7eb38c9280b6523afdf065693f84 /src | |
| parent | e16071f7b2253cc66e769b7891ab554d12cf93b1 (diff) | |
| download | textadept-b965beae414d95a8382539f92f891b073edc5fcd.tar.gz textadept-b965beae414d95a8382539f92f891b073edc5fcd.zip | |
Improvements and fixes to the `install` rule; src/Makefile
Thanks to Pedro Andres Aranda Gutierrez.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/src/Makefile b/src/Makefile index 9e948fe2..024e4863 100644 --- a/src/Makefile +++ b/src/Makefile @@ -73,11 +73,11 @@ else MAKE = gmake endif PREFIX ?= /usr/local + bin_dir = $(PREFIX)/bin + data_dir = $(PREFIX)/share/textadept XDG_DATA_DIR ?= $(PREFIX)/share/applications - bin_dir = $(DESTDIR)$(PREFIX)/bin - data_dir = $(DESTDIR)$(PREFIX)/share/textadept - xdg_data_dir = $(DESTDIR)$(XDG_DATA_DIR) svg_file = $(data_dir)/core/images/textadept.svg + desktop_files := $(wildcard *.desktop) ifeq (, $(findstring curses, $(MAKECMDGOALS))) plat_flag = -DGTK ifndef GTK3 @@ -271,20 +271,22 @@ textadeptjit-curses.exe: $(sci_objs) $(sci_lex_objs) ScintillaTerm.o \ install: $(install_targets) | ../core ../doc ../init.lua ../lexers ../LICENSE \ ../modules ../properties.lua ../themes - install -d $(bin_dir) $(data_dir) - install $^ $(data_dir) - cp -r $| $(data_dir) - ln -s $(subst .., $(subst $(DESTDIR),, $(data_dir)), $^) $(bin_dir) - if [ -d $(XDG_DATA_DIR) ]; then \ - mkdir -p $(xdg_data_dir); \ - for desktop_file in `ls *.desktop`; do \ + install -d $(DESTDIR)$(bin_dir) $(DESTDIR)$(data_dir) + install $^ $(DESTDIR)$(data_dir) + cp -r $| $(DESTDIR)$(data_dir) + 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.svg|Icon=$(svg_file)|' $$desktop_file > \ - $(xdg_data_dir)/$$desktop_file; \ + $(DESTDIR)$(XDG_DATA_DIR)/$$desktop_file; \ done; \ fi uninstall: - rm -r $(bin_dir)/textadept* $(data_dir) - if [ -d $(XDG_DATA_DIR) ]; then rm $(xdg_data_dir)/textadept*.desktop; fi + rm -r $(DESTDIR)$(bin_dir)/textadept* $(DESTDIR)$(data_dir) + if [ -d "$(XDG_DATA_DIR)" ]; then \ + rm $(DESTDIR)$(XDG_DATA_DIR)/textadept*.desktop; \ + fi # Clean. |