Allow CYGWIN directory to be specified as via environment variable

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

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