Merge branch 'mm/makefile-developer-can-be-in-config-mak'
authorJunio C Hamano <gitster@pobox.com>
Fri, 3 Jun 2016 21:38:02 +0000 (14:38 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 3 Jun 2016 21:38:02 +0000 (14:38 -0700)
"make DEVELOPER=1" worked as expected; setting DEVELOPER=1 in
config.mak didn't.

* mm/makefile-developer-can-be-in-config-mak:
Makefile: add $(DEVELOPER_CFLAGS) variable
Makefile: move 'ifdef DEVELOPER' after config.mak* inclusion

1  2 
Makefile
diff --cc Makefile
Simple merge