mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
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>
This commit is contained in:
parent
d22e567770
commit
1fd8f97f6e
|
@ -2,6 +2,7 @@
|
||||||
# Makefile for perl support modules and routine
|
# Makefile for perl support modules and routine
|
||||||
#
|
#
|
||||||
makfile:=perl.mak
|
makfile:=perl.mak
|
||||||
|
modules =
|
||||||
|
|
||||||
PERL_PATH_SQ = $(subst ','\'',$(PERL_PATH))
|
PERL_PATH_SQ = $(subst ','\'',$(PERL_PATH))
|
||||||
prefix_SQ = $(subst ','\'',$(prefix))
|
prefix_SQ = $(subst ','\'',$(prefix))
|
||||||
|
@ -22,19 +23,35 @@ clean:
|
||||||
|
|
||||||
ifdef NO_PERL_MAKEMAKER
|
ifdef NO_PERL_MAKEMAKER
|
||||||
instdir_SQ = $(subst ','\'',$(prefix)/lib)
|
instdir_SQ = $(subst ','\'',$(prefix)/lib)
|
||||||
|
|
||||||
|
modules += Git
|
||||||
|
modules += Git/I18N
|
||||||
|
modules += Git/SVN/Memoize/YAML
|
||||||
|
modules += Git/SVN/Fetcher
|
||||||
|
modules += Git/SVN/Editor
|
||||||
|
modules += Git/SVN/Prompt
|
||||||
|
modules += Git/SVN/Ra
|
||||||
|
|
||||||
$(makfile): ../GIT-CFLAGS Makefile
|
$(makfile): ../GIT-CFLAGS Makefile
|
||||||
echo all: private-Error.pm Git.pm Git/I18N.pm > $@
|
echo all: private-Error.pm Git.pm Git/I18N.pm > $@
|
||||||
echo ' mkdir -p blib/lib/Git' >> $@
|
echo ' mkdir -p blib/lib/Git/SVN/Memoize' >> $@
|
||||||
echo ' $(RM) blib/lib/Git.pm; cp Git.pm blib/lib/' >> $@
|
set -e; \
|
||||||
echo ' $(RM) blib/lib/Git/I18N.pm; cp Git/I18N.pm blib/lib/Git/' >> $@
|
for i in $(modules); \
|
||||||
|
do \
|
||||||
|
echo ' $(RM) blib/lib/'$$i'.pm' >> $@; \
|
||||||
|
echo ' cp '$$i'.pm blib/lib/'$$i'.pm' >> $@; \
|
||||||
|
done
|
||||||
echo ' $(RM) blib/lib/Error.pm' >> $@
|
echo ' $(RM) blib/lib/Error.pm' >> $@
|
||||||
'$(PERL_PATH_SQ)' -MError -e 'exit($$Error::VERSION < 0.15009)' || \
|
'$(PERL_PATH_SQ)' -MError -e 'exit($$Error::VERSION < 0.15009)' || \
|
||||||
echo ' cp private-Error.pm blib/lib/Error.pm' >> $@
|
echo ' cp private-Error.pm blib/lib/Error.pm' >> $@
|
||||||
echo install: >> $@
|
echo install: >> $@
|
||||||
echo ' mkdir -p "$$(DESTDIR)$(instdir_SQ)"' >> $@
|
echo ' mkdir -p "$$(DESTDIR)$(instdir_SQ)/Git/SVN/Memoize"' >> $@
|
||||||
echo ' mkdir -p "$$(DESTDIR)$(instdir_SQ)/Git"' >> $@
|
set -e; \
|
||||||
echo ' $(RM) "$$(DESTDIR)$(instdir_SQ)/Git.pm"; cp Git.pm "$$(DESTDIR)$(instdir_SQ)"' >> $@
|
for i in $(modules); \
|
||||||
echo ' $(RM) "$$(DESTDIR)$(instdir_SQ)/Git/I18N.pm"; cp Git/I18N.pm "$$(DESTDIR)$(instdir_SQ)/Git"' >> $@
|
do \
|
||||||
|
echo ' $(RM) "$$(DESTDIR)$(instdir_SQ)/'$$i'.pm"' >> $@; \
|
||||||
|
echo ' cp '$$i'.pm "$$(DESTDIR)$(instdir_SQ)/'$$i'.pm"' >> $@; \
|
||||||
|
done
|
||||||
echo ' $(RM) "$$(DESTDIR)$(instdir_SQ)/Error.pm"' >> $@
|
echo ' $(RM) "$$(DESTDIR)$(instdir_SQ)/Error.pm"' >> $@
|
||||||
'$(PERL_PATH_SQ)' -MError -e 'exit($$Error::VERSION < 0.15009)' || \
|
'$(PERL_PATH_SQ)' -MError -e 'exit($$Error::VERSION < 0.15009)' || \
|
||||||
echo ' cp private-Error.pm "$$(DESTDIR)$(instdir_SQ)/Error.pm"' >> $@
|
echo ' cp private-Error.pm "$$(DESTDIR)$(instdir_SQ)/Error.pm"' >> $@
|
||||||
|
|
Loading…
Reference in a new issue