Skip to content

Commit 1fd8f97

Browse files
jrngitster
authored andcommitted
perl/Makefile: install Git::SVN::* when NO_PERL_MAKEMAKER=yes, too
v1.7.11-rc1~12^2~2 (2012-05-27) and friends split some git-svn code into separate modules but did not update the fallback rules to install them when NO_PERL_MAKEMAKER is set. Add the appropriate rules so users without MakeMaker can use git-svn again. Affected modules: Git::SVN::Prompt, Git::SVN::Fetcher, Git::SVN::Editor, Git::SVN::Ra, Git::SVN::Memoize::YAML. Reported-by: Adam Roben <[email protected]> Signed-off-by: Jonathan Nieder <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent d22e567 commit 1fd8f97

File tree

1 file changed

+24
-7
lines changed

1 file changed

+24
-7
lines changed

perl/Makefile

Lines changed: 24 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
# Makefile for perl support modules and routine
33
#
44
makfile:=perl.mak
5+
modules =
56

67
PERL_PATH_SQ = $(subst ','\'',$(PERL_PATH))
78
prefix_SQ = $(subst ','\'',$(prefix))
@@ -22,19 +23,35 @@ clean:
2223

2324
ifdef NO_PERL_MAKEMAKER
2425
instdir_SQ = $(subst ','\'',$(prefix)/lib)
26+
27+
modules += Git
28+
modules += Git/I18N
29+
modules += Git/SVN/Memoize/YAML
30+
modules += Git/SVN/Fetcher
31+
modules += Git/SVN/Editor
32+
modules += Git/SVN/Prompt
33+
modules += Git/SVN/Ra
34+
2535
$(makfile): ../GIT-CFLAGS Makefile
2636
echo all: private-Error.pm Git.pm Git/I18N.pm > $@
27-
echo ' mkdir -p blib/lib/Git' >> $@
28-
echo ' $(RM) blib/lib/Git.pm; cp Git.pm blib/lib/' >> $@
29-
echo ' $(RM) blib/lib/Git/I18N.pm; cp Git/I18N.pm blib/lib/Git/' >> $@
37+
echo ' mkdir -p blib/lib/Git/SVN/Memoize' >> $@
38+
set -e; \
39+
for i in $(modules); \
40+
do \
41+
echo ' $(RM) blib/lib/'$$i'.pm' >> $@; \
42+
echo ' cp '$$i'.pm blib/lib/'$$i'.pm' >> $@; \
43+
done
3044
echo ' $(RM) blib/lib/Error.pm' >> $@
3145
'$(PERL_PATH_SQ)' -MError -e 'exit($$Error::VERSION < 0.15009)' || \
3246
echo ' cp private-Error.pm blib/lib/Error.pm' >> $@
3347
echo install: >> $@
34-
echo ' mkdir -p "$$(DESTDIR)$(instdir_SQ)"' >> $@
35-
echo ' mkdir -p "$$(DESTDIR)$(instdir_SQ)/Git"' >> $@
36-
echo ' $(RM) "$$(DESTDIR)$(instdir_SQ)/Git.pm"; cp Git.pm "$$(DESTDIR)$(instdir_SQ)"' >> $@
37-
echo ' $(RM) "$$(DESTDIR)$(instdir_SQ)/Git/I18N.pm"; cp Git/I18N.pm "$$(DESTDIR)$(instdir_SQ)/Git"' >> $@
48+
echo ' mkdir -p "$$(DESTDIR)$(instdir_SQ)/Git/SVN/Memoize"' >> $@
49+
set -e; \
50+
for i in $(modules); \
51+
do \
52+
echo ' $(RM) "$$(DESTDIR)$(instdir_SQ)/'$$i'.pm"' >> $@; \
53+
echo ' cp '$$i'.pm "$$(DESTDIR)$(instdir_SQ)/'$$i'.pm"' >> $@; \
54+
done
3855
echo ' $(RM) "$$(DESTDIR)$(instdir_SQ)/Error.pm"' >> $@
3956
'$(PERL_PATH_SQ)' -MError -e 'exit($$Error::VERSION < 0.15009)' || \
4057
echo ' cp private-Error.pm "$$(DESTDIR)$(instdir_SQ)/Error.pm"' >> $@

0 commit comments

Comments
 (0)