diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-05-03 23:26:54 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-05-03 23:26:54 -0700 |
| commit | 9aae177a4adff326421e55c7c0f3138de15ce2c1 (patch) | |
| tree | ca19b08ff373ea122f87c90d03d111b03a89921e /perl/Makefile | |
| parent | 50acc58914bf02217e55fdd739a844f2bfc45410 (diff) | |
| parent | e3ad95a8be82663d27cb501eaf9bad86a30f9cda (diff) | |
| download | git-9aae177a4adff326421e55c7c0f3138de15ce2c1.tar.gz | |
Merge branch 'maint'
* maint:
gitweb: use decode_utf8 directly
posix compatibility for t4200
Document 'opendiff' value in config.txt and git-mergetool.txt
Allow PERL_PATH="/usr/bin/env perl"
Make xstrndup common
diff.c: fix "size cache" handling.
http-fetch: Disable use of curl multi support for libcurl < 7.16.
Diffstat (limited to 'perl/Makefile')
| -rw-r--r-- | perl/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/perl/Makefile b/perl/Makefile index 17d004e5a0..0d695fd2f3 100644 --- a/perl/Makefile +++ b/perl/Makefile @@ -33,7 +33,7 @@ $(makfile): ../GIT-CFLAGS Makefile echo ' echo $(instdir_SQ)' >> $@ else $(makfile): Makefile.PL ../GIT-CFLAGS - '$(PERL_PATH_SQ)' $< PREFIX='$(prefix_SQ)' + $(PERL_PATH) $< PREFIX='$(prefix_SQ)' endif # this is just added comfort for calling make directly in perl dir |