diff options
| author |   mitchell <70453897+667e-11@users.noreply.github.com> | 2012-11-26 09:47:17 -0500 |
|---|---|---|
| committer | mitchell <70453897+667e-11@users.noreply.github.com> | 2012-11-26 09:47:17 -0500 |
| commit | cb181f02066e1b7e15ef7a5838e011644bdf9035 (patch) | |
| tree | 56f7c27c23356f88ae3e8b1d8b1c6536afdefd11 | |
| parent | 8cb3bef141c7c2b781ce5d559a2ea27b77e88271 (diff) | |
| download | textadept-cb181f02066e1b7e15ef7a5838e011644bdf9035.tar.gz textadept-cb181f02066e1b7e15ef7a5838e011644bdf9035.zip | |
Do not set DESTDIR and added PREFIX; src/Makefile
This allows for easier building of packages.
Thanks to Pedro Andres Arranda Gutierrez.
| -rw-r--r-- | THANKS.md | 1 | ||||
| -rw-r--r-- | src/Makefile | 8 |
2 files changed, 5 insertions, 4 deletions
@@ -20,6 +20,7 @@ Textadept the amazing editor that it is today. * Neil Hodgson
* Nils Nordman
* Patrick McMorris
+* Pedro Andres Aranda Gutierrez
* Robert Gieseke
* Russell Dickinson
* Ryan Pusztai
diff --git a/src/Makefile b/src/Makefile index 1f995490..a696bc83 100644 --- a/src/Makefile +++ b/src/Makefile @@ -67,10 +67,10 @@ ifneq (, $(or $(findstring Linux, $(kernel)), $(findstring BSD, $(kernel)))) endif MAKE = gmake endif - DESTDIR = /usr/local + PREFIX ?= /usr/local - bin_dir = $(DESTDIR)/bin - data_dir = $(DESTDIR)/share/textadept + bin_dir = $(DESTDIR)$(PREFIX)/bin + data_dir = $(DESTDIR)$(PREFIX)/share/textadept ifneq (ncurses, $(MAKECMDGOALS)) plat_flag = -DGTK @@ -299,7 +299,7 @@ install: ../textadept ../textadeptjit ../textadept-ncurses \ install -d $(bin_dir) $(data_dir) install $^ $(data_dir) cp -r $| $(data_dir) - ln -s $(subst .., $(data_dir), $^) $(bin_dir) + ln -s $(subst .., $(subst $(DESTDIR),, $(data_dir)), $^) $(bin_dir) uninstall: rm $(bin_dir)/textadept* rm -r $(data_dir) |