Use ncursesw by default on Linux

References jonas#920

INSTALL.adoc

@@ -26,9 +26,10 @@ By default, `tig` is installed in `$HOME/bin`. To install `tig` elsewhere set
 
 Additional build options can be defined in the `config.make` file, which is
 loaded automatically when running `make` if it exists. By default,
-`contrib/config.make-$kernel_name` is loaded if it exists (currently only
-available for macOS [`Darwin`] and Cygwin). See `contrib/config.make` for
-example build options.
+`contrib/config.make-$kernel_name` is loaded if it exists (currently
+available for Linux, macOS [`Darwin`] and Cygwin but Linux users should
+prefer the `configure` script). See `contrib/config.make` for example build
+options.
 
 Documentation files, such as manpages, are distributed in the release tarballs,
 and can be installed using:
@@ -97,7 +98,7 @@ never made any changes to it.
 Installation using Nix
 ----------------------
 
-You can use link:https://nixos.org/nix/[Nix] to install Tig on NixOS, or any Linux/OSX distribution with Nix installed:
+You can use link:https://nixos.org/nix/[Nix] to install Tig on NixOS, or any Linux/macOS distribution with Nix installed:
 
         $ nix-env -i tig
 	
@@ -127,7 +128,7 @@ Build configuration
 -------------------
 
 Build settings are read from the file `config.make` and for certain systems also
-from `contrib/config.make-$kernel`. An example of the latter is Mac OS X, where
+from `contrib/config.make-$kernel`. An example of the latter is macOS, where
 `contrib/config.make-Darwin` provides out-of-the-box configuration for using the
 system ncurses library and linking with the iconv library. This makes it easy to
 configure the build without having to use the `configure` script. As a side

NEWS.adoc

@@ -16,7 +16,7 @@ Bug fixes:
  - Escape variables with %% in external commands. (#1091, #1095)
  - Fix parsing of -L argument. (#1100)
  - Bugfix: smart-case does not work when search term contains a space. (#1108)
-
+ - Use ncursesw by default on Linux. (#920)
 
 tig-2.5.3
 ---------

contrib/config.make

@@ -4,12 +4,12 @@
 prefix=/usr/local
 
 # Use ncursesw.
-LDLIBS = -lncursesw
-CPPFLAGS = -DHAVE_NCURSESW_CURSES_H
+TIG_LDLIBS = -lncursesw
+TIG_CPPFLAGS = -DHAVE_NCURSESW_CURSES_H
 
 # Use readline.
-#LDLIBS += -lreadline
-#CPPFLAGS += -DHAVE_READLINE
+#TIG_LDLIBS += -lreadline
+#TIG_CPPFLAGS += -DHAVE_READLINE
 
 # Uncomment to enable work-around for missing setenv().
 #NO_SETENV=y

contrib/config.make-Darwin

@@ -1,4 +1,4 @@
-# Example configuration for Darwin / Mac OS X.
+# Example configuration for Darwin / macOS.
 
 # Work-around for Homebrew-based xmlto.
 export XML_CATALOG_FILES=/usr/local/etc/xml/catalog

contrib/config.make-Linux

@@ -0,0 +1,26 @@
+# Example configuration for Linux.
+
+# Install files under /usr/local instead of under $HOME.
+#prefix=/usr/local
+
+# Use ncursesw.
+TIG_LDLIBS = -lncursesw
+TIG_CPPFLAGS = -DHAVE_NCURSESW_CURSES_H
+
+# Use readline.
+#TIG_LDLIBS += -lreadline
+#TIG_CPPFLAGS += -DHAVE_READLINE
+
+# Uncomment to enable work-around for missing setenv().
+#NO_SETENV=y
+
+# Uncomment to enable work-around for missing mkstemps().
+#NO_MKSTEMPS=y
+
+# Uncomment to enable work-around for missing wordexp().
+#NO_WORDEXP=y
+
+# Uncomment to not include built-in tigrc inside the binary.
+#NO_BUILTIN_TIGRC=y
+
+# vim: ft=make: