Re: [PATCH 3/4] Makefile: allow building without perl

From: Robin H. Johnson <robbat2@gentoo.org>
Date: Apr 4, 2009, 22:47 UTC
Message-ID: <20090404T224109Z@curie.orbis-terrarum.net>
In-Reply-To: <20090403193220.GC5547@coredump.intra.peff.net>

On Fri, Apr 03, 2009 at 03:32:20PM -0400, Jeff King wrote:

> For systems with a missing or broken perl, it is nicer to
> explicitly say "we don't want perl" because:

Part of the patch got missed. In the case of missing perl, we can detect it, originally we had a compare of PERL_PATH for emptiness.

diff Makefile.orig Makefile --- Makefile.orig +++ Makefile

@@ -354,12 +354,6 @@ BUILT_INS += git-whatchanged$X
 # what 'all' will build and 'install' will install, in gitexecdir
 ALL_PROGRAMS = $(PROGRAMS) $(SCRIPTS)
 
-# what 'all' will build but not install in gitexecdir
-OTHER_PROGRAMS = git$X
-ifndef NO_PERL
-OTHER_PROGRAMS += gitweb/gitweb.cgi
-endif
-
 # Set paths to tools early so that they can be used for version tests.
 ifndef SHELL_PATH
        SHELL_PATH = /bin/sh
@@ -367,6 +361,18 @@ endif
 ifndef PERL_PATH
        PERL_PATH = /usr/bin/perl
 endif
+ifeq ($(wildcard $(PERL_PATH)),)
+PERL_PATH =
+NO_PERL = NoThanks
+NO_PERL_MAKEMAKER = NoThanks
+export NO_PERL NO_PERL_MAKEMAKER
+endif
+
+# what 'all' will build but not install in gitexecdir
+OTHER_PROGRAMS = git$X
+ifndef NO_PERL
+OTHER_PROGRAMS += gitweb/gitweb.cgi
+endif

-- 
Robin Hugh Johnson
Gentoo Linux Developer & Infra Guy
E-Mail     : robbat2@gentoo.org
GnuPG FP   : 11AC BA4F 4778 E3F6 E4ED  F38E B27B 944E 3488 4E85