tree c5ea9fcb2846101bcb8e3c4edcaed72a8a0e6bc4
parent 5f8937db39c4eb495a48931172348200a91821a3
parent 9fb1e6984201892b6dfb7e1a9195e2544a5af754
author Junio C Hamano <gitster@pobox.com> 1306428132 -0700
committer Junio C Hamano <gitster@pobox.com> 1306428132 -0700

Merge branch 'kk/maint-prefix-in-config-mak' into maint

* kk/maint-prefix-in-config-mak:
  Honor $(prefix) set in config.mak* when defining ETC_GIT*
  Revert "Honor $(prefix) set in config.mak* when defining ETC_GIT* and sysconfdir"
  Honor $(prefix) set in config.mak* when defining ETC_GIT* and sysconfdir