From acecbcb53867a4d9bf83e2b6a4e933b02723bfd2 Mon Sep 17 00:00:00 2001 From: Jeffrey Altman Date: Fri, 6 May 2011 09:49:52 -0400 Subject: [PATCH] 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: I32cd79eba33fc80e15308010fafdaecb527d23f0 Reviewed-on: http://gerrit.openafs.org/4629 Tested-by: BuildBot Reviewed-by: Jeffrey Altman Reviewed-on: http://gerrit.openafs.org/4630 Tested-by: Jeffrey Altman --- doc/xml/AdminGuide/NTMakefile | 12 ++++++------ doc/xml/QuickStartUnix/NTMakefile | 12 ++++++------ doc/xml/ReleaseNotesWindows/NTMakefile | 12 ++++++------ doc/xml/UserGuide/NTMakefile | 12 ++++++------ 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/doc/xml/AdminGuide/NTMakefile b/doc/xml/AdminGuide/NTMakefile index a7508b9f7..2dde80018 100644 --- 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 2f56fd3f7..d89fb63b2 100644 --- 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 5d892d280..1f4967817 100644 --- 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 3f59aa921..8f7bdd28f 100644 --- 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 -- 2.39.5