diff options
| author | jlam <jlam> | 2005-05-02 06:36:29 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2005-05-02 06:36:29 +0000 |
| commit | 629dcd47b520e2beff4b6f7fe1418d96f73ac4f9 (patch) | |
| tree | b0cf37b01b0ae67b7dec95c66ff1ed81e30b2f61 /mk/tools/perl.mk | |
| parent | 94e6f22073778cbc28dad1bb4657fad3a3cd7d4e (diff) | |
| download | pkgsrc-629dcd47b520e2beff4b6f7fe1418d96f73ac4f9.tar.gz | |
If we only define the "TOOL" variable if the real command exists, then
the "TOOL" variables won't be properly defined for the top-leve make
after returning from making the install-depends target if we're using
the pkgsrc-supplied tool. Define the "TOOL" variable unconditionally
instead.
Diffstat (limited to 'mk/tools/perl.mk')
| -rw-r--r-- | mk/tools/perl.mk | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/mk/tools/perl.mk b/mk/tools/perl.mk index 2e4fef75236..08881aa1cde 100644 --- a/mk/tools/perl.mk +++ b/mk/tools/perl.mk @@ -1,4 +1,4 @@ -# $NetBSD: perl.mk,v 1.4 2005/05/02 04:33:53 jlam Exp $ +# $NetBSD: perl.mk,v 1.5 2005/05/02 06:36:29 jlam Exp $ # Create a symlink from ${TOOLS_DIR}/bin/perl to ${PERL5} when USE_PERL5 # is defined. This ensures that when "perl" is invoked, the pkgsrc perl @@ -13,9 +13,7 @@ TOOLS_DEPMETHOD.perl?= BUILD_DEPENDS TOOLS_DEPENDS.perl?= ${BUILDLINK_DEPENDS.perl}:${BUILDLINK_PKGSRCDIR.perl} TOOLS_SYMLINK+= perl TOOLS_REAL_CMD.perl= ${LOCALBASE}/bin/perl -. if exists(${TOOLS_REAL_CMD.perl}) PERL5= ${TOOLS_REAL_CMD.perl} -. endif . endif . if defined(TOOLS_DEPMETHOD.perl) && defined(TOOLS_DEPENDS.perl) . if empty(${TOOLS_DEPMETHOD.perl}:M${TOOLS_DEPENDS.perl}) |