diff options
| -rw-r--r-- | doc/12_Compiling.md | 3 | ||||
| -rw-r--r-- | src/Makefile | 11 |
2 files changed, 9 insertions, 5 deletions
diff --git a/doc/12_Compiling.md b/doc/12_Compiling.md index 077b726e..2870d5ed 100644 --- a/doc/12_Compiling.md +++ b/doc/12_Compiling.md @@ -87,6 +87,9 @@ a normal Linux application, run the usual `make` and then `make install` or */usr/local* but you can change this by setting `DESTDIR` (e.g. `make install DESTDIR=/prefix/to/install/to`). +Similarly, `make ncurses` and `make ncurses install` installs the ncurses +version. + ### Cross Compiling for Windows When cross-compiling from within Linux, first unzip the GTK+ for Windows bundle diff --git a/src/Makefile b/src/Makefile index 09844a22..376583ec 100644 --- a/src/Makefile +++ b/src/Makefile @@ -65,7 +65,7 @@ ifneq (, $(or $(findstring Linux, $(kernel)), $(findstring BSD, $(kernel)))) LDFLAGS += -ldl MAKE = make else - ifeq (ncurses, $(MAKECMDGOALS)) + ifeq (ncurses, $(findstring ncurses, $(MAKECMDGOALS))) LDFLAGS += -liconv endif MAKE = gmake @@ -75,7 +75,7 @@ ifneq (, $(or $(findstring Linux, $(kernel)), $(findstring BSD, $(kernel)))) bin_dir = $(DESTDIR)$(PREFIX)/bin data_dir = $(DESTDIR)$(PREFIX)/share/textadept - ifneq (ncurses, $(MAKECMDGOALS)) + ifneq (ncurses, $(findstring ncurses, $(MAKECMDGOALS))) plat_flag = -DGTK ifndef GTK3 gtk_version = 2.0 @@ -84,9 +84,11 @@ ifneq (, $(or $(findstring Linux, $(kernel)), $(findstring BSD, $(kernel)))) endif gtk_flags = $(shell pkg-config --cflags gtk+-$(gtk_version)) gtk_libs = $(shell pkg-config --libs gtk+-$(gtk_version)) + install_targets = ../textadept ../textadeptjit else plat_flag = -DNCURSES ncurses_lib = -lncursesw + install_targets = ../textadept-ncurses ../textadeptjit-ncurses endif x64 = $(shell echo "" | $(CC) -E -dM - | grep __x86_64__ | cut -d ' ' -f 3) ifeq (1, $(x64)) @@ -297,9 +299,8 @@ textadeptjit-ncurses.osx: textadeptjit-ncurses; mv ../$< ../$@ # Install/uninstall. -install: ../textadept ../textadeptjit ../textadept-ncurses \ - ../textadeptjit-ncurses | ../core ../doc ../init.lua ../lexers \ - ../LICENSE ../modules ../themes +install: $(install_targets) | ../core ../doc ../init.lua ../lexers ../LICENSE \ + ../modules ../themes install -d $(bin_dir) $(data_dir) install $^ $(data_dir) cp -r $| $(data_dir) |