Windows: replace CYGWIN envvar with CYGWINDIR
authorJeffrey Altman <jaltman@your-file-system.com>
Fri, 6 May 2011 13:49:52 +0000 (09:49 -0400)
committerJeffrey Altman <jaltman@openafs.org>
Fri, 6 May 2011 14:27:30 +0000 (07:27 -0700)
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>

doc/xml/AdminGuide/NTMakefile
doc/xml/QuickStartUnix/NTMakefile
doc/xml/ReleaseNotesWindows/NTMakefile
doc/xml/UserGuide/NTMakefile

index a7508b9..2dde800 100644 (file)
@@ -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
index 2f56fd3..d89fb63 100644 (file)
@@ -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
index 5d892d2..1f49678 100644 (file)
@@ -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
index 3f59aa9..8f7bdd2 100644 (file)
@@ -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