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 <buildbot@rampaginggeek.com>
Tested-by: Jeffrey Altman <jaltman@openafs.org>
Reviewed-by: Jeffrey Altman <jaltman@openafs.org>
(cherry picked from 4138a778fe821493c726826ffc4715f5f46222d9)

Change-Id: Ifd5ba10176ba1a7d6fda7506a0a4c250ad1945f6
Reviewed-on: http://gerrit.openafs.org/5143
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Tested-by: Jeffrey Altman <jaltman@openafs.org>
Reviewed-by: Jeffrey Altman <jaltman@openafs.org>

diff --git a/doc/man-pages/NTMakefile b/doc/man-pages/NTMakefile
index e6b26a02f6eab9197cd4c201b5eedc3a02e6f9dd..a00781d8e9337550a01880b401b14c49083c6cdf 100644 (file)
--- 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 64f0246b678e00398e66a153a76466afa3ef985f..7b1514ae66d34eefd02d6ea800cfee6c584e0150 100644 (file)
--- 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 241f60a8a77488a5eb033aebf25fcbcad5b12293..8fd2746e958fedae1bd5ebe258674faae577aee7 100644 (file)
--- 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 2d7f7ab83a1f22a7470f62b376f2425fd3252b59..1b3746b11f3d3c902ab5dcaba91ad40fab5bcefd 100644 (file)
--- 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