* [PATCH] Fix generation of perl/perl.mak
@ 2007-10-25 20:17 Alex Riesen
2007-10-25 20:42 ` Johannes Schindelin
0 siblings, 1 reply; 3+ messages in thread
From: Alex Riesen @ 2007-10-25 20:17 UTC (permalink / raw)
To: git; +Cc: Junio C Hamano
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>
---
Makefile | 6 +-----
1 files changed, 1 insertions(+), 5 deletions(-)
diff --git a/Makefile b/Makefile
index b728920..72f5ef4 100644
--- a/Makefile
+++ b/Makefile
@@ -812,7 +812,7 @@ $(patsubst %.sh,%,$(SCRIPT_SH)) : % : %.sh
$(patsubst %.perl,%,$(SCRIPT_PERL)): perl/perl.mak
-perl/perl.mak: GIT-CFLAGS
+perl/perl.mak: GIT-CFLAGS perl/Makefile perl/Makefile.PL
$(QUIET_SUBDIR0)perl $(QUIET_SUBDIR1) PERL_PATH='$(PERL_PATH_SQ)' prefix='$(prefix_SQ)' $(@F)
$(patsubst %.perl,%,$(SCRIPT_PERL)): % : %.perl
@@ -931,10 +931,6 @@ $(XDIFF_LIB): $(XDIFF_OBJS)
$(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $(XDIFF_OBJS)
-perl/Makefile: perl/Git.pm perl/Makefile.PL GIT-CFLAGS
- (cd perl && $(PERL_PATH) Makefile.PL \
- PREFIX='$(prefix_SQ)')
-
doc:
$(MAKE) -C Documentation all
--
1.5.3.4.403.g401f6
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] Fix generation of perl/perl.mak
2007-10-25 20:17 [PATCH] Fix generation of perl/perl.mak Alex Riesen
@ 2007-10-25 20:42 ` Johannes Schindelin
2007-10-25 21:21 ` Alex Riesen
0 siblings, 1 reply; 3+ messages in thread
From: Johannes Schindelin @ 2007-10-25 20:42 UTC (permalink / raw)
To: Alex Riesen; +Cc: git, Junio C Hamano
Hi,
On Thu, 25 Oct 2007, Alex Riesen wrote:
> Besides, a changed Git.pm is *NOT* a reason to rebuild all the perl
> scripts, so remove the dependency too.
>
> [...]
>
> @@ -931,10 +931,6 @@ $(XDIFF_LIB): $(XDIFF_OBJS)
> $(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $(XDIFF_OBJS)
>
>
> -perl/Makefile: perl/Git.pm perl/Makefile.PL GIT-CFLAGS
> - (cd perl && $(PERL_PATH) Makefile.PL \
> - PREFIX='$(prefix_SQ)')
> -
This is not really the dependency triggering a rebuild of all perl
scripts, right?
Ciao,
Dscho
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] Fix generation of perl/perl.mak
2007-10-25 20:42 ` Johannes Schindelin
@ 2007-10-25 21:21 ` Alex Riesen
0 siblings, 0 replies; 3+ messages in thread
From: Alex Riesen @ 2007-10-25 21:21 UTC (permalink / raw)
To: Johannes Schindelin; +Cc: git, Junio C Hamano
Johannes Schindelin, Thu, Oct 25, 2007 22:42:07 +0200:
> On Thu, 25 Oct 2007, Alex Riesen wrote:
>
> > Besides, a changed Git.pm is *NOT* a reason to rebuild all the perl
> > scripts, so remove the dependency too.
> >
> > [...]
> >
> > -perl/Makefile: perl/Git.pm perl/Makefile.PL GIT-CFLAGS
> > - (cd perl && $(PERL_PATH) Makefile.PL \
> > - PREFIX='$(prefix_SQ)')
> > -
>
> This is not really the dependency triggering a rebuild of all perl
> scripts, right?
In a way. This rebuilds perl/perl.mak which, in turn, can cause the
rebuild of all perl scripts. The rule you replaced with "[...]" does
the same, but uses perl/Makefile, which generates the perl.mak
depending on the NO_PERL_MAKEMAKER setting.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2007-10-25 21:21 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-10-25 20:17 [PATCH] Fix generation of perl/perl.mak Alex Riesen
2007-10-25 20:42 ` Johannes Schindelin
2007-10-25 21:21 ` Alex Riesen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).