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.

Change-Id: Iaf14a82134cc2dcf3c23b1e5a0ed65606e2487bb
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>

diff --git a/doc/man-pages/NTMakefile b/doc/man-pages/NTMakefile
index 91c769fdb6c630e149c8f34dc5ce04c0ede39f8d..8a58d0a8e1d5d491ab419c41f6c4326b32af7851 100644 (file)
--- a/doc/man-pages/NTMakefile
+++ b/doc/man-pages/NTMakefile
@@ -344,7 +344,7 @@ PODS = \
 
 html\index.html: $(PODS)
         @echo Building man pages in HTML format
-        perl generate-html
+        $(PERL) generate-html
 
 
 install: html\index.html
@@ -384,10 +384,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 6bf9e240540cc8517e251464ff1147fc6df0be2d..08a044526b27f6fd21e1099f45fe9ba45a8312c2 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 63a84130c95d556d22df3f0a46a290f6255cea64..768acb3f493fb6bf4b4f084a1f03f3b81b6c42fe 100644 (file)
--- a/src/config/NTMakefile.i386_nt40
+++ b/src/config/NTMakefile.i386_nt40
@@ -228,6 +228,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 16efeca80ae15329ee774d41d68c2f294e488250..ee5b5fa542fc031688103ed3cf20539f70280521 100644 (file)
--- a/src/config/NTMakefile.i386_w2k
+++ b/src/config/NTMakefile.i386_w2k
@@ -232,6 +232,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