php
diff --git a/‎config.m4‎
Lines changed: 1 addition & 1 deletion b/‎config.m4‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎config.w32‎
Lines changed: 1 addition & 1 deletion b/‎config.w32‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/php7/php_solr.c‎ renamed to ‎src/php_solr.c‎ b/‎src/php7/php_solr.c‎ renamed to ‎src/php_solr.c‎
diff --git a/‎src/php7/php_solr.h‎ renamed to ‎src/php_solr.h‎ b/‎src/php7/php_solr.h‎ renamed to ‎src/php_solr.h‎
diff --git a/‎src/php7/php_solr_api.h‎ renamed to ‎src/php_solr_api.h‎ b/‎src/php7/php_solr_api.h‎ renamed to ‎src/php_solr_api.h‎
diff --git a/‎src/php7/php_solr_client.c‎ renamed to ‎src/php_solr_client.c‎ b/‎src/php7/php_solr_client.c‎ renamed to ‎src/php_solr_client.c‎
diff --git a/‎src/php7/php_solr_collapse_function.c‎ renamed to ‎src/php_solr_collapse_function.c‎ b/‎src/php7/php_solr_collapse_function.c‎ renamed to ‎src/php_solr_collapse_function.c‎
diff --git a/‎src/php7/php_solr_dismax_query.c‎ renamed to ‎src/php_solr_dismax_query.c‎ b/‎src/php7/php_solr_dismax_query.c‎ renamed to ‎src/php_solr_dismax_query.c‎
diff --git a/‎src/php7/php_solr_dismax_query.h‎ renamed to ‎src/php_solr_dismax_query.h‎ b/‎src/php7/php_solr_dismax_query.h‎ renamed to ‎src/php_solr_dismax_query.h‎
diff --git a/‎src/php7/php_solr_document.c‎ renamed to ‎src/php_solr_document.c‎ b/‎src/php7/php_solr_document.c‎ renamed to ‎src/php_solr_document.c‎
@@ -94,7 +94,7 @@ if test "$PHP_SOLR" != "no"; then
     subdir=src/php5
     AC_MSG_RESULT([PHP 5])
     ],[
-    subdir=src/php7
+    subdir=src
     AC_MSG_RESULT([PHP 7])
     ])
 
 
@@ -91,7 +91,7 @@ if(PHP_SOLR != 'no')
 		/* XXX tricky job here, override configure_module_dirname, define the basic extension,
 			then set it back*/
 		var old_conf_dir = configure_module_dirname;
-		configure_module_dirname = configure_module_dirname + "\\src\\php7";
+		configure_module_dirname = configure_module_dirname + "\\src";
 
 		EXTENSION('solr',
 					'php_solr.c php_solr_client.c php_solr_document.c php_solr_exception.c ' +