Merge branch 'jk/make-findstring-makeflags-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 16 Oct 2015 21:32:38 +0000 (14:32 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 16 Oct 2015 21:32:38 +0000 (14:32 -0700)
commit47c566a4d670e892ffa42fe307c45f41fc5a6ac5
tree6ce218a854165f685aa72b1b1d56993a0dcace0e
parent4d2a3011eed6abda1399de2774bd8f08db1581f9
parentef49e05a6431727b54c399d1f3636c76ac682d61
Merge branch 'jk/make-findstring-makeflags-fix' into maint

Customization to change the behaviour with "make -w" and "make -s"
in our Makefile was broken when they were used together.

* jk/make-findstring-makeflags-fix:
  Makefile: fix MAKEFLAGS tests with multiple flags
Makefile