1 --- git-1.7.3.2/perl/Makefile_orig	Thu Oct 21 20:49:16 2010

     2 +++ git-1.7.3.2/perl/Makefile	Tue Mar 22 09:43:32 2011

     3 @@ -20,20 +20,18 @@

     4  	$(RM) $(makfile).old

     5  

     6  ifdef NO_PERL_MAKEMAKER

     7 -instdir_SQ = $(subst ','\'',$(prefix)/lib)

     8 +instdir_SQ = $(subst ','\'',$$(PERL_LIB))

     9  $(makfile): ../GIT-CFLAGS Makefile

    10  	echo all: private-Error.pm Git.pm > $@

    11  	echo '	mkdir -p blib/lib' >> $@

    12  	echo '	$(RM) blib/lib/Git.pm; cp Git.pm blib/lib/' >> $@

    13  	echo '	$(RM) blib/lib/Error.pm' >> $@

    14 -	'$(PERL_PATH_SQ)' -MError -e 'exit($$Error::VERSION < 0.15009)' || \

    15  	echo '	cp private-Error.pm blib/lib/Error.pm' >> $@

    16  	echo install: >> $@

    17 -	echo '	mkdir -p "$$(DESTDIR)$(instdir_SQ)"' >> $@

    18 -	echo '	$(RM) "$$(DESTDIR)$(instdir_SQ)/Git.pm"; cp Git.pm "$$(DESTDIR)$(instdir_SQ)"' >> $@

    19 -	echo '	$(RM) "$$(DESTDIR)$(instdir_SQ)/Error.pm"' >> $@

    20 -	'$(PERL_PATH_SQ)' -MError -e 'exit($$Error::VERSION < 0.15009)' || \

    21 -	echo '	cp private-Error.pm "$$(DESTDIR)$(instdir_SQ)/Error.pm"' >> $@

    22 +	echo '	mkdir -p "$$(DESTDIR)/$(instdir_SQ)"' >> $@

    23 +	echo '	$(RM) "$$(DESTDIR)/$(instdir_SQ)/Git.pm"; cp Git.pm "$$(DESTDIR)/$(instdir_SQ)"' >> $@

    24 +	echo '	$(RM) "$$(DESTDIR)/$(instdir_SQ)/Error.pm"' >> $@

    25 +	echo '	cp private-Error.pm "$$(DESTDIR)/$(instdir_SQ)/Error.pm"' >> $@

    26  	echo instlibdir: >> $@

    27  	echo '	echo $(instdir_SQ)' >> $@

    28  else