Skip to content

Commit d1a2057

Browse files
raalkmlgitster
authored andcommitted
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>
1 parent 59b2023 commit d1a2057

File tree

1 file changed

+1
-5
lines changed

1 file changed

+1
-5
lines changed

Makefile

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -778,7 +778,7 @@ $(patsubst %.sh,%,$(SCRIPT_SH)) : % : %.sh
778778

779779
$(patsubst %.perl,%,$(SCRIPT_PERL)): perl/perl.mak
780780

781-
perl/perl.mak: GIT-CFLAGS
781+
perl/perl.mak: GIT-CFLAGS perl/Makefile perl/Makefile.PL
782782
$(QUIET_SUBDIR0)perl $(QUIET_SUBDIR1) PERL_PATH='$(PERL_PATH_SQ)' prefix='$(prefix_SQ)' $(@F)
783783

784784
$(patsubst %.perl,%,$(SCRIPT_PERL)): % : %.perl
@@ -907,10 +907,6 @@ $(XDIFF_LIB): $(XDIFF_OBJS)
907907
$(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $(XDIFF_OBJS)
908908

909909

910-
perl/Makefile: perl/Git.pm perl/Makefile.PL GIT-CFLAGS
911-
(cd perl && $(PERL_PATH) Makefile.PL \
912-
PREFIX='$(prefix_SQ)')
913-
914910
doc:
915911
$(MAKE) -C Documentation all
916912

0 commit comments

Comments
 (0)