@matheusbsbs / matheus-bagliano / commits / f6276fe159
Fork 0

Git.pm: tentative fix to test the freshly built Git.pm

Signed-off-by: Junio C Hamano <junkio@cox.net>

Junio C Hamano committed Jun 24, 2006 at 19:41 UTC f6276fe159fe985af2d5831f4629ceefb33d082e
2 files changed +6 -2
Makefile
+5 -2
@@ -531,9 +531,12 @@ $(patsubst %.sh,%,$(SCRIPT_SH)) : % : %.sh
531 chmod +x $@+
532 mv $@+ $@
533
534 -$(patsubst %.perl,%,$(SCRIPT_PERL)) : % : %.perl
534 +$(patsubst %.perl,%,$(SCRIPT_PERL)): perl/Makefile
535 +$(patsubst %.perl,%,$(SCRIPT_PERL)): % : %.perl
536 rm -f $@ $@+
536 - sed -e '1s|#!.*perl\(.*\)|#!$(PERL_PATH_SQ)\1 -I'"$$(make -s -C perl instlibdir)"'|' \
537 + INSTLIBDIR=$$(make -s -C perl instlibdir) && \
538 + sed -e '1s|#!.*perl\(.*\)|#!$(PERL_PATH_SQ)\1|' \
539 + -e 's|@@INSTLIBDIR@@|'"$$INSTLIBDIR"'|g' \
540 -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \
541 $@.perl >$@+
542 chmod +x $@+
git-fmt-merge-msg.perl
+1
@@ -5,6 +5,7 @@
5 # Read .git/FETCH_HEAD and make a human readable merge message
6 # by grouping branches and tags together to form a single line.
7
8 +unshift @INC, '@@INSTLIBDIR@@';
9 use strict;
10 use Git;
11 use Error qw(:try);