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

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

diff --git a/Makefile b/Makefile
index 1371e79df271e25845bd0dd0e9993a10b69119ff..9b9be592ae4e7b54762708918adcca5f30395ec6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -531,9 +531,12 @@ $(patsubst %.sh,%,$(SCRIPT_SH)) : % : %.sh
        chmod +x $@+
        mv $@+ $@
 
        chmod +x $@+
        mv $@+ $@
 

-$(patsubst %.perl,%,$(SCRIPT_PERL)) : % : %.perl
+$(patsubst %.perl,%,$(SCRIPT_PERL)): perl/Makefile
+$(patsubst %.perl,%,$(SCRIPT_PERL)): % : %.perl

        rm -f $@ $@+
        rm -f $@ $@+

-       sed -e '1s|#!.*perl\(.*\)|#!$(PERL_PATH_SQ)\1 -I'"$$(make -s -C perl instlibdir)"'|' \
+       INSTLIBDIR=$$(make -s -C perl instlibdir) && \
+       sed -e '1s|#!.*perl\(.*\)|#!$(PERL_PATH_SQ)\1|' \
+           -e 's|@@INSTLIBDIR@@|'"$$INSTLIBDIR"'|g' \

            -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \
            $@.perl >$@+
        chmod +x $@+
            -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \
            $@.perl >$@+
        chmod +x $@+

diff --git a/git-fmt-merge-msg.perl b/git-fmt-merge-msg.perl
index f86231e14b0bf0d16ae3ac7978b824b3a994d359..e8fad02e757506e423b05b4a37fe3df8dba87ab2 100755 (executable)
--- a/git-fmt-merge-msg.perl
+++ b/git-fmt-merge-msg.perl
@@ -5,6 +5,7 @@
 # Read .git/FETCH_HEAD and make a human readable merge message
 # by grouping branches and tags together to form a single line.
 
 # Read .git/FETCH_HEAD and make a human readable merge message
 # by grouping branches and tags together to form a single line.
 

+unshift @INC, '@@INSTLIBDIR@@';

 use strict;
 use Git;
 use Error qw(:try);
 use strict;
 use Git;
 use Error qw(:try);