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

perl/Makefile: Unset INSTALL_BASE when making perl.mak

PREFIX and INSTALL_BASE are mutually exclusive. If both are supplied by INSTALL_BASE being set in PERL_MM_OPT ExtUtils::MakeMaker will produce an error: $ echo $PERL_MM_OPT INSTALL_BASE=/home/avar/perl5 $ make -C perl PERL_PATH='/usr/bin/perl' prefix='/home/avar' perl.mak make: Entering directory `/home/avar/g/git/perl' /usr/bin/perl Makefile.PL PREFIX='/home/avar' Only one of PREFIX or INSTALL_BASE can be given. Not both. make: *** [perl.mak] Error 255 make: Leaving directory `/home/avar/g/git/perl' Change the perl Makefile to work around this by explicitly unsetting INSTALL_BASE. INSTALL_BASE is set in PERL_MM_OPT by e.g. the popular local::lib package, from its documentation: eval $(perl -I$HOME/perl5/lib/perl5 -Mlocal::lib 2>/dev/null) Many other environments might also have set PERL_MM_OPT before building Git. This change enables us to build in these environments. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Ævar Arnfjörð Bjarmason committed Aug 3, 2010 at 10:30 UTC fa57f717cd679fd808845e21d6e51a277b76a15d
1 file changed +1 -1
perl/Makefile
+1 -1
@@ -38,7 +38,7 @@ $(makfile): ../GIT-CFLAGS Makefile
38 echo ' echo $(instdir_SQ)' >> $@
39 else
40 $(makfile): Makefile.PL ../GIT-CFLAGS
41 - $(PERL_PATH) $< PREFIX='$(prefix_SQ)'
41 + $(PERL_PATH) $< PREFIX='$(prefix_SQ)' INSTALL_BASE=''
42 endif
43
44 # this is just added comfort for calling make directly in perl dir