Fix generation of perl/perl.mak
The code generating perl/Makefile from Makefile.PL was causing trouble because it didn't considered NO_PERL_MAKEMAKER and ran makemaker unconditionally, rewriting perl.mak. Makemaker is FUBAR in ActiveState Perl, and perl/Makefile has a replacement for it. Besides, a changed Git.pm is *NOT* a reason to rebuild all the perl scripts, so remove the dependency too. Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Alex Riesen committed
Oct 25, 2007 at 22:17 UTC
d1a2057560b33c926ba481618105edbb65d2c91c
1 file changed
+1
-5
Makefile
+1
-5
@@ -778,7 +778,7 @@ $(patsubst %.sh,%,$(SCRIPT_SH)) : % : %.sh
778
779
$(patsubst %.perl,%,$(SCRIPT_PERL)): perl/perl.mak
780
781
-perl/perl.mak: GIT-CFLAGS
781
+perl/perl.mak: GIT-CFLAGS perl/Makefile perl/Makefile.PL
782
$(QUIET_SUBDIR0)perl $(QUIET_SUBDIR1) PERL_PATH='$(PERL_PATH_SQ)' prefix='$(prefix_SQ)' $(@F)
783
784
$(patsubst %.perl,%,$(SCRIPT_PERL)): % : %.perl
@@ -907,10 +907,6 @@ $(XDIFF_LIB): $(XDIFF_OBJS)
907
$(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $(XDIFF_OBJS)
908
909
910
-perl/Makefile: perl/Git.pm perl/Makefile.PL GIT-CFLAGS
911
- (cd perl && $(PERL_PATH) Makefile.PL \
912
- PREFIX='$(prefix_SQ)')
913
-
910
doc:
911
$(MAKE) -C Documentation all
912