From: David Given <dg@cowlark.com>
Date: Sat, 3 Sep 2016 17:29:10 +0000 (+0200)
Subject: Merge from master.
X-Git-Url: https://git.ndcode.org/public/gitweb.cgi?a=commitdiff_plain;h=4020a3dd9e296dd692912390feb2412adaeb9dc7;p=ack.git

Merge from master.

--HG--
branch : default-branch
---

4020a3dd9e296dd692912390feb2412adaeb9dc7
diff --cc Makefile
index ebba0914d,af143bcfa..282ff0a9a
--- a/Makefile
+++ b/Makefile
@@@ -25,8 -25,26 +25,26 @@@ BUILDDIR = $(ACK_TEMP_DIR)/ack-buil
  # What build flags do you want to use?
  
  CFLAGS = -g
 -LDFLAGS = 
 +LDFLAGS =
  
+ # Various commands.
+ 
+ AR = ar
+ CC = gcc
+ 
+ # Which build system to use; use 'ninja' or 'make' (in lower case). Leave
+ # blank to autodetect.
+ 
+ BUILDSYSTEM =
+ 
+ # Build flags for ninja.
+ 
+ NINJAFLAGS =
+ 
+ # Build flags for make.
+ 
+ MAKEFLAGS = -r
+ 
  # ======================================================================= #
  #                         END OF CONFIGURATION                            #
  # ======================================================================= #