Junio C Hamano <gits...@pobox.com> wrote: > What was happening was that originally, pu had ms/makefile-pl but > not ms/git-svn-pm. Hence, perl/Git/SVN.pm did not exist. I ran > "make" and it created perl/perl.mak that does not know about > Git/SVN.pm; > > Then ms/git-svn-pm is merged to pu and now we have perl/Git/SVN.pm. > But there is nothing in ms/makefile-pl that says on what files > perl.mak depends on. > > I think there needs to be a dependency in to recreate perl/perl.mak > when any of the *.pm files are changed, perhaps like this. > > I am not sure why perl/perl.mak is built by the top-level Makefile, > instead of just using "$(MAKE) -C perl/", though...
I'm not sure why perl/perl.mak is built by the top-level Makefile, either. I'll put the following after ms/makefile-pl but before ms/git-svn-pm: >From a6ea2301d1bb6fd7c7415fed3aa7673542a563bd Mon Sep 17 00:00:00 2001 From: Junio C Hamano <gits...@pobox.com> Date: Fri, 27 Jul 2012 20:04:20 +0000 Subject: [PATCH] perl: detect new files in MakeMaker builds While Makefile.PL now finds .pm files on its own, it does not detect new files after it generates perl/perl.mak. [ew: commit message] ref: http://mid.gmane.org/7vlii51xz4....@alter.siamese.dyndns.org Signed-off-by: Eric Wong <normalper...@yhbt.net> --- Makefile | 7 +++++++ perl/Makefile | 1 + 2 files changed, 8 insertions(+) diff --git a/Makefile b/Makefile index b0b3493..e2a4ac7 100644 --- a/Makefile +++ b/Makefile @@ -2090,6 +2090,13 @@ $(SCRIPT_LIB) : % : %.sh GIT-SCRIPT-DEFINES ifndef NO_PERL $(patsubst %.perl,%,$(SCRIPT_PERL)): perl/perl.mak +perl/perl.mak: perl/PM.stamp + +perl/PM.stamp: FORCE + $(QUIET_GEN)find perl -type f -name '*.pm' | sort >$@+ && \ + { cmp $@+ $@ >/dev/null 2>/dev/null || mv $@+ $@; } && \ + $(RM) $@+ + perl/perl.mak: GIT-CFLAGS GIT-PREFIX perl/Makefile perl/Makefile.PL $(QUIET_SUBDIR0)perl $(QUIET_SUBDIR1) PERL_PATH='$(PERL_PATH_SQ)' prefix='$(prefix_SQ)' $(@F) diff --git a/perl/Makefile b/perl/Makefile index 8493d76..4969ef8 100644 --- a/perl/Makefile +++ b/perl/Makefile @@ -20,6 +20,7 @@ clean: $(RM) ppport.h $(RM) $(makfile) $(RM) $(makfile).old + $(RM) PM.stamp ifdef NO_PERL_MAKEMAKER instdir_SQ = $(subst ','\'',$(prefix)/lib) -- Eric Wong -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
