From cbd458b09b3862cba1f133a89c50e382a8127b16 Mon Sep 17 00:00:00 2001 From: Jeffrey Altman Date: Thu, 28 Jul 2011 15:05:28 -0400 Subject: [PATCH] Windows: permit perl command to be explicitly set Add PERL variable to the build system. If not specified externally the variable will be set to 'perl'. However, ActiveState Perl should be used and not Cygwin Perl. The build environment should indicate that by specifying a PERL setting. SET PERL=c:\perl64\bin\perl.exe or similar. Reviewed-on: http://gerrit.openafs.org/5115 Tested-by: BuildBot Tested-by: Jeffrey Altman Reviewed-by: Jeffrey Altman (cherry picked from 4138a778fe821493c726826ffc4715f5f46222d9) Change-Id: Ifd5ba10176ba1a7d6fda7506a0a4c250ad1945f6 Reviewed-on: http://gerrit.openafs.org/5143 Tested-by: BuildBot Tested-by: Jeffrey Altman Reviewed-by: Jeffrey Altman --- doc/man-pages/NTMakefile | 8 ++++---- src/config/NTMakefile.amd64_w2k | 3 +++ src/config/NTMakefile.i386_nt40 | 3 +++ src/config/NTMakefile.i386_w2k | 3 +++ 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/doc/man-pages/NTMakefile b/doc/man-pages/NTMakefile index e6b26a02f..a00781d8e 100644 --- a/doc/man-pages/NTMakefile +++ b/doc/man-pages/NTMakefile @@ -343,7 +343,7 @@ PODS = \ html\index.html: $(PODS) @echo Building man pages in HTML format - perl generate-html + $(PERL) generate-html install: html\index.html @@ -383,10 +383,10 @@ clean:: .SUFFIXES: .pod.in {pod1}.pod.in{pod1}.pod:: - perl merge-pod $< + $(PERL) merge-pod $< {pod5}.pod.in{pod5}.pod:: - perl merge-pod $< + $(PERL) merge-pod $< {pod8}.pod.in{pod8}.pod:: - perl merge-pod $< + $(PERL) merge-pod $< diff --git a/src/config/NTMakefile.amd64_w2k b/src/config/NTMakefile.amd64_w2k index 64f0246b6..7b1514ae6 100644 --- a/src/config/NTMakefile.amd64_w2k +++ b/src/config/NTMakefile.amd64_w2k @@ -224,6 +224,9 @@ MAKECMD = nmake.exe !IF !DEFINED(MIDL) MIDL = midl !ENDIF +!IF !DEFINED(PERL) +PERL = perl +!ENDIF COMPILE_ET = $(DESTDIR)\bin\compile_et RXGEN = $(DESTDIR)\bin\rxgen diff --git a/src/config/NTMakefile.i386_nt40 b/src/config/NTMakefile.i386_nt40 index 241f60a8a..8fd2746e9 100644 --- a/src/config/NTMakefile.i386_nt40 +++ b/src/config/NTMakefile.i386_nt40 @@ -230,6 +230,9 @@ MAKECMD = nmake.exe !IF !DEFINED(MIDL) MIDL = midl !ENDIF +!IF !DEFINED(PERL) +PERL = perl +!ENDIF COMPILE_ET = $(DESTDIR)\bin\compile_et RXGEN = $(DESTDIR)\bin\rxgen diff --git a/src/config/NTMakefile.i386_w2k b/src/config/NTMakefile.i386_w2k index 2d7f7ab83..1b3746b11 100644 --- a/src/config/NTMakefile.i386_w2k +++ b/src/config/NTMakefile.i386_w2k @@ -234,6 +234,9 @@ MAKECMD = nmake.exe !IF !DEFINED(MIDL) MIDL = midl !ENDIF +!IF !DEFINED(PERL) +PERL = perl +!ENDIF COMPILE_ET = $(DESTDIR)\bin\compile_et RXGEN = $(DESTDIR)\bin\rxgen -- 2.39.5