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 <adam@roben.org> Signed-off-by: Jonathan Nieder <jrnieder@gmali.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jonathan Nieder committed
Jun 15, 2012 at 13:05 UTC
1fd8f97f6e2c5f928e7399adb59b6d87ac82eb08
1 file changed
+24
-7
perl/Makefile
+24
-7
@@ -2,6 +2,7 @@
2
# Makefile for perl support modules and routine
3
#
4
makfile:=perl.mak
5
+modules =
6
7
PERL_PATH_SQ = $(subst ','\'',$(PERL_PATH))
8
prefix_SQ = $(subst ','\'',$(prefix))
@@ -22,19 +23,35 @@ clean:
23
24
ifdef NO_PERL_MAKEMAKER
25
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
+
35
$(makfile): ../GIT-CFLAGS Makefile
36
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
44
echo ' $(RM) blib/lib/Error.pm' >> $@
45
'$(PERL_PATH_SQ)' -MError -e 'exit($$Error::VERSION < 0.15009)' || \
46
echo ' cp private-Error.pm blib/lib/Error.pm' >> $@
47
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
55
echo ' $(RM) "$$(DESTDIR)$(instdir_SQ)/Error.pm"' >> $@
56
'$(PERL_PATH_SQ)' -MError -e 'exit($$Error::VERSION < 0.15009)' || \
57
echo ' cp private-Error.pm "$$(DESTDIR)$(instdir_SQ)/Error.pm"' >> $@