Better implementation of the prefix thing

diff --git a/win32/build/config.w32 b/win32/build/config.w32
index 0dbd2c272a4acc13762cbb99ee06c43f867cc05f..d18b301e39be9a40f99b899a19837fb737d8c2a0 100644 (file)
--- a/win32/build/config.w32
+++ b/win32/build/config.w32
@@ -21,10 +21,11 @@ ARG_ENABLE('debug', 'Compile with debugging symbols', "no");
 ARG_ENABLE('zts', 'Thread safety', 'yes');
 
 // Configures the hard-coded installation dir
-if (PHP_DEBUG == "yes") {
-       ARG_ENABLE('prefix', 'where PHP will be installed', 'C:\\php5\\debug');
-} else {
-       ARG_ENABLE('prefix', 'where PHP will be installed', 'C:\\php5');
+ARG_ENABLE('prefix', 'where PHP will be installed', '');
+if (PHP_PREFIX == '') {
+       PHP_PREFIX = "C:\\php" + PHP_VERSION;
+       if (PHP_DEBUG == "yes")
+               PHP_PREFIX += "\\debug";
 }
 DEFINE('PHP_PREFIX', PHP_PREFIX);