summaryrefslogtreecommitdiff
path: root/merge-tree.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2009-02-05 00:04:17 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-02-05 00:28:43 -0800
commit0c0ead7e79559013d6f9eea6f7e55d1845c11171 (patch)
tree64ddba7d633286cabac844dd48beac4b14a06903 /merge-tree.c
parentMerge branch 'jc/fsck' (early part) (diff)
downloadtgif-0c0ead7e79559013d6f9eea6f7e55d1845c11171.tar.xz
Makefile: fix misdetection of relative pathnames
The installation rules wanted to differentiate between a template_dir that is given as an absolute path (e.g. /usr/share/git-core/templates) and a relative one (e.g. share/git-core/templates) but it was done by checking if $(abspath $(template_dir)) and $(template_dir) yield the same string. This was wrong in at least two ways. * The user can give template_dir with a trailing slash from the command line to invoke make or from the included config.mak. A directory path ought to mean the same thing with or without such a trailing slash but use of $(abspath) means an absolute path with a trailing slash fails the test. * Versions of GNU make older than 3.81 do not have $(abspath) to begin with. This changes the detection logic to see if the given path begins with a slash. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-tree.c')
0 files changed, 0 insertions, 0 deletions