MFH: fix make install target on Cygwin

diff --git a/sapi/cgi/config9.m4 b/sapi/cgi/config9.m4
index 01c48fe0e5c61293364803d7a1874587e7a20654..6a0670b0c9a953a9c011fa2851fd9756d82e056c 100644 (file)
--- a/sapi/cgi/config9.m4
+++ b/sapi/cgi/config9.m4
@@ -86,7 +86,14 @@ if test "$PHP_SAPI" = "default"; then
     AC_MSG_RESULT(yes)
 
     PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/sapi/cgi/Makefile.frag)
-    SAPI_CGI_PATH=sapi/cgi/php-cgi
+    case $host_alias in
+      *cygwin* )
+        SAPI_CGI_PATH=sapi/cgi/php-cgi.exe
+        ;;
+      * )
+        SAPI_CGI_PATH=sapi/cgi/php-cgi
+        ;;
+    esac
     PHP_SUBST(SAPI_CGI_PATH)
 
     PHP_TEST_WRITE_STDOUT

diff --git a/sapi/cli/config.m4 b/sapi/cli/config.m4
index 17af168c2eaa3a5c888846dde9a264b85f70d438..d8c9943a3169f04bc6c802a97c7fca8ac82342ea 100644 (file)
--- a/sapi/cli/config.m4
+++ b/sapi/cli/config.m4
@@ -22,6 +22,10 @@ if test "$PHP_SAPI_CLI" != "no"; then
   *darwin*)
     BUILD_CLI="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_CLI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)"
     ;;
+  *cygwin*)
+    SAPI_CLI_PATH=sapi/cli/php.exe
+    BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)"
+    ;;
   *)
     BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)"
     ;;