From a29baa30c8db5fa33f808201c841f6e7ccdca7df Mon Sep 17 00:00:00 2001
From: Sam Ruby <rubys@php.net>
Date: Sun, 24 Oct 1999 16:32:46 +0000
Subject: [PATCH] Allow CYGWIN directory to be specified as via environment
 variable

---
 php4dll.dsp   | 9 ++++++---
 php4dllts.dsp | 9 ++++++---
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/php4dll.dsp b/php4dll.dsp
index 957f5cfd20..e1178aadb5 100644
--- a/php4dll.dsp
+++ b/php4dll.dsp
@@ -806,7 +806,8 @@ SOURCE=".\configuration-parser.y"
 InputPath=".\configuration-parser.y"
 
 BuildCmds= \
-	bison --output=configuration-parser.c -v -d -S "C:\Program Files\Cygnus\share\bison.simple" -p cfg configuration-parser.y
+	if not "X%CYGWIN%"=="X" bison --output=configuration-parser.c -v -d -S "%CYGWIN%\share\bison.simple" -p cfg configuration-parser.y \
+	if "X%CYGWIN%"=="X" bison --output=configuration-parser.c -v -d -S "C:\Program Files\Cygnus\share\bison.simple" -p cfg configuration-parser.y
 
 "configuration-parser.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
@@ -821,7 +822,8 @@ BuildCmds= \
 InputPath=".\configuration-parser.y"
 
 BuildCmds= \
-	bison --output=configuration-parser.c -v -d -S "C:\Program Files\Cygnus\share\bison.simple" -p cfg configuration-parser.y
+	if not"X%CYGWIN%"=="X" bison --output=configuration-parser.c -v -d -S "%CYGWIN%\share\bison.simple" -p cfg configuration-parser.y \
+	if "X%CYGWIN%"=="X" bison --output=configuration-parser.c -v -d -S "C:\Program Files\Cygnus\share\bison.simple" -p cfg configuration-parser.y
 
 "configuration-parser.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
@@ -844,7 +846,8 @@ InputPath=.\ext\standard\parsedate.y
 
 "ext\standard\parsedate.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	cd ext\standard 
-	bison --output=parsedate.c -v -d -S "C:\Program Files\Cygnus\share\bison.simple"  parsedate.y 
+	if not "X%CYGWIN%"=="X" bison --output=parsedate.c -v -d -S "%CYGWIN%\share\bison.simple" parsedate.y  \
+	if "X%CYGWIN%"=="X" bison --output=parsedate.c -v -d -S "C:\Program Files\Cygnus\share\bison.simple" parsedate.y 
 	
 # End Custom Build
 
diff --git a/php4dllts.dsp b/php4dllts.dsp
index 85f492f7f4..ee45bc2c34 100644
--- a/php4dllts.dsp
+++ b/php4dllts.dsp
@@ -778,7 +778,8 @@ SOURCE=".\configuration-parser.y"
 InputPath=".\configuration-parser.y"
 
 BuildCmds= \
-	bison --output=configuration-parser.c -v -d -S "C:\Program Files\Cygnus\share\bison.simple" -p cfg configuration-parser.y
+	if not "X%CYGWIN%"=="X" bison --output=configuration-parser.c -v -d -S "%CYGWIN%\share\bison.simple" -p cfg configuration-parser.y \
+	if "X%CYGWIN%"=="X" bison --output=configuration-parser.c -v -d -S "C:\Program Files\Cygnus\share\bison.simple" -p cfg configuration-parser.y
 
 "configuration-parser.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
@@ -793,7 +794,8 @@ BuildCmds= \
 InputPath=".\configuration-parser.y"
 
 BuildCmds= \
-	bison --output=configuration-parser.c -v -d -S "C:\Program Files\Cygnus\share\bison.simple" -p cfg configuration-parser.y
+	if not"X%CYGWIN%"=="X" bison --output=configuration-parser.c -v -d -S "%CYGWIN%\share\bison.simple" -p cfg configuration-parser.y \
+	if "X%CYGWIN%"=="X" bison --output=configuration-parser.c -v -d -S "C:\Program Files\Cygnus\share\bison.simple" -p cfg configuration-parser.y
 
 "configuration-parser.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
@@ -816,7 +818,8 @@ InputPath=.\ext\standard\parsedate.y
 
 "ext\standard\parsedate.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	cd ext\standard 
-	bison --output=parsedate.c -v -d -S "C:\Program Files\Cygnus\share\bison.simple" parsedate.y 
+	if not "X%CYGWIN%"=="X" bison --output=parsedate.c -v -d -S "%CYGWIN%\share\bison.simple" parsedate.y  \
+	if "X%CYGWIN%"=="X" bison --output=parsedate.c -v -d -S "C:\Program Files\Cygnus\share\bison.simple" parsedate.y 
 	
 # End Custom Build
 
-- 
2.50.1