Windows: replace CYGWIN envvar with CYGWINDIR

The environment variable CYGWIN (starting with cygwin 1.7.1) is
now used by CYGWIN to set configuration parameters for the cygwin
runtime library.  OpenAFS used it to indicate the location of the
Cygwin install directory.  Since there is a conflict, rename CYGWIN
to CYGWINDIR.

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

diff --git a/doc/xml/AdminGuide/NTMakefile b/doc/xml/AdminGuide/NTMakefile
index a7508b9f77e38d2ff7db595a3f5e49f9529442e1..2dde800186b23ce7124d480a03f5393a9db4138d 100644 (file)
--- a/doc/xml/AdminGuide/NTMakefile
+++ b/doc/xml/AdminGuide/NTMakefile
@@ -29,14 +29,14 @@ VERSFILE = version
 !INCLUDE ..\..\..\src\config\NTMakefile.$(SYS_NAME)
 !INCLUDE ..\..\..\src\config\NTMakefile.version
 
-!IFNDEF CYGWIN
-CYGWIN     = c:/cygwin
+!IFNDEF CYGWINDIR
+CYGWINDIR     = c:/cygwin
 !ENDIF
 !IFNDEF DOCBOOK_XSL
-!IF (EXIST($(CYGWIN)/usr/share/sgml/docbook/xsl-stylesheets))
-DOCBOOK_XSL = $(CYGWIN)/usr/share/sgml/docbook/xsl-stylesheets
-!ELSE IF (EXIST($(CYGWIN)/usr/share/docbook-xsl))
-DOCBOOK_XSL = $(CYGWIN)/usr/share/docbook-xsl
+!IF (EXIST($(CYGWINDIR)/usr/share/sgml/docbook/xsl-stylesheets))
+DOCBOOK_XSL = $(CYGWINDIR)/usr/share/sgml/docbook/xsl-stylesheets
+!ELSE IF (EXIST($(CYGWINDIR)/usr/share/docbook-xsl))
+DOCBOOK_XSL = $(CYGWINDIR)/usr/share/docbook-xsl
 !ELSE
 !ERROR DOCBOOK_XSL cannot be determined
 !ENDIF

diff --git a/doc/xml/QuickStartUnix/NTMakefile b/doc/xml/QuickStartUnix/NTMakefile
index 2f56fd3f74d61e4420fe7d226f801981f50c8e87..d89fb63b298b69c132d4a1864ec398cd441361a3 100644 (file)
--- a/doc/xml/QuickStartUnix/NTMakefile
+++ b/doc/xml/QuickStartUnix/NTMakefile
@@ -29,14 +29,14 @@ VERSFILE = version
 !INCLUDE ..\..\..\src\config\NTMakefile.$(SYS_NAME)
 !INCLUDE ..\..\..\src\config\NTMakefile.version
 
-!IFNDEF CYGWIN
-CYGWIN     = c:/cygwin
+!IFNDEF CYGWINDIR
+CYGWINDIR     = c:/cygwin
 !ENDIF
 !IFNDEF DOCBOOK_XSL
-!IF (EXIST($(CYGWIN)/usr/share/sgml/docbook/xsl-stylesheets))
-DOCBOOK_XSL = $(CYGWIN)/usr/share/sgml/docbook/xsl-stylesheets
-!ELSE IF (EXIST($(CYGWIN)/usr/share/docbook-xsl))
-DOCBOOK_XSL = $(CYGWIN)/usr/share/docbook-xsl
+!IF (EXIST($(CYGWINDIR)/usr/share/sgml/docbook/xsl-stylesheets))
+DOCBOOK_XSL = $(CYGWINDIR)/usr/share/sgml/docbook/xsl-stylesheets
+!ELSE IF (EXIST($(CYGWINDIR)/usr/share/docbook-xsl))
+DOCBOOK_XSL = $(CYGWINDIR)/usr/share/docbook-xsl
 !ELSE
 !ERROR DOCBOOK_XSL cannot be determined
 !ENDIF

diff --git a/doc/xml/ReleaseNotesWindows/NTMakefile b/doc/xml/ReleaseNotesWindows/NTMakefile
index 5d892d280cfb46aa18125e81d318b8a37489d934..1f49678178dda6e5fbd5562d8e1fded0c7641692 100644 (file)
--- a/doc/xml/ReleaseNotesWindows/NTMakefile
+++ b/doc/xml/ReleaseNotesWindows/NTMakefile
@@ -29,14 +29,14 @@ VERSFILE = version
 !INCLUDE ..\..\..\src\config\NTMakefile.$(SYS_NAME)
 !INCLUDE ..\..\..\src\config\NTMakefile.version
 
-!IFNDEF CYGWIN
-CYGWIN     = c:/cygwin
+!IFNDEF CYGWINDIR
+CYGWINDIR     = c:/cygwin
 !ENDIF
 !IFNDEF DOCBOOK_XSL
-!IF (EXIST($(CYGWIN)/usr/share/sgml/docbook/xsl-stylesheets))
-DOCBOOK_XSL = $(CYGWIN)/usr/share/sgml/docbook/xsl-stylesheets
-!ELSE IF (EXIST($(CYGWIN)/usr/share/docbook-xsl))
-DOCBOOK_XSL = $(CYGWIN)/usr/share/docbook-xsl
+!IF (EXIST($(CYGWINDIR)/usr/share/sgml/docbook/xsl-stylesheets))
+DOCBOOK_XSL = $(CYGWINDIR)/usr/share/sgml/docbook/xsl-stylesheets
+!ELSE IF (EXIST($(CYGWINDIR)/usr/share/docbook-xsl))
+DOCBOOK_XSL = $(CYGWINDIR)/usr/share/docbook-xsl
 !ELSE
 !ERROR DOCBOOK_XSL cannot be determined
 !ENDIF

diff --git a/doc/xml/UserGuide/NTMakefile b/doc/xml/UserGuide/NTMakefile
index 3f59aa9212175d32d4288db7715b5cd92fcc57a1..8f7bdd28f07f44b3b461bf8e64c8f851e2cc5593 100644 (file)
--- a/doc/xml/UserGuide/NTMakefile
+++ b/doc/xml/UserGuide/NTMakefile
@@ -29,14 +29,14 @@ VERSFILE = version
 !INCLUDE ..\..\..\src\config\NTMakefile.$(SYS_NAME)
 !INCLUDE ..\..\..\src\config\NTMakefile.version
 
-!IFNDEF CYGWIN
-CYGWIN     = c:/cygwin
+!IFNDEF CYGWINDIR
+CYGWINDIR     = c:/cygwin
 !ENDIF
 !IFNDEF DOCBOOK_XSL
-!IF (EXIST($(CYGWIN)/usr/share/sgml/docbook/xsl-stylesheets))
-DOCBOOK_XSL = $(CYGWIN)/usr/share/sgml/docbook/xsl-stylesheets
-!ELSE IF (EXIST($(CYGWIN)/usr/share/docbook-xsl))
-DOCBOOK_XSL = $(CYGWIN)/usr/share/docbook-xsl
+!IF (EXIST($(CYGWINDIR)/usr/share/sgml/docbook/xsl-stylesheets))
+DOCBOOK_XSL = $(CYGWINDIR)/usr/share/sgml/docbook/xsl-stylesheets
+!ELSE IF (EXIST($(CYGWINDIR)/usr/share/docbook-xsl))
+DOCBOOK_XSL = $(CYGWINDIR)/usr/share/docbook-xsl
 !ELSE
 !ERROR DOCBOOK_XSL cannot be determined
 !ENDIF