From 0f18a15e89e78ba42e87a3ee52d456de6a016044 Mon Sep 17 00:00:00 2001
From: Anatol Belski <ab@php.net>
Date: Tue, 17 Mar 2015 09:20:16 +0100
Subject: [PATCH] Fixed bug #65406 Enchant broker plugins are in the wrong
 place in windows

---
 NEWS                   |  4 ++++
 win32/build/mkdist.php | 23 +++++++++++++++++------
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/NEWS b/NEWS
index 46a1102c251..3a8bbad6853 100644
--- a/NEWS
+++ b/NEWS
@@ -13,6 +13,10 @@ PHP                                                                        NEWS
   . Fixed bug #69221 (Segmentation fault when using a generator in combination
     with an Iterator). (Nikita)
 
+- Enchant:
+  . Fixed bug #65406 (Enchant broker plugins are in the wrong place in windows
+    builds). (Anatol)
+
 - Filter:
   . Fixed bug #69202 (FILTER_FLAG_STRIP_BACKTICK ignored unless other
     flags are used). (Jeff Welch)
diff --git a/win32/build/mkdist.php b/win32/build/mkdist.php
index 640e9b3bd77..9e4422addca 100644
--- a/win32/build/mkdist.php
+++ b/win32/build/mkdist.php
@@ -322,13 +322,24 @@ foreach (glob($ICU_DLLS) as $filename) {
 	copy($filename, "$dist_dir/" . basename($filename));
 }
 $ENCHANT_DLLS = array(
-	'glib-2.dll',
-	'gmodule-2.dll',
-	'libenchant_myspell.dll',
-	'libenchant_ispell.dll',
+	array('', 'glib-2.dll'),
+	array('', 'gmodule-2.dll'),
+	array('lib/enchant', 'libenchant_myspell.dll'),
+	array('lib/enchant', 'libenchant_ispell.dll'),
 );
-foreach ($ENCHANT_DLLS as $filename) {
-	copy($php_build_dir . '/bin/' . $filename, "$dist_dir/" . basename($filename));
+foreach ($ENCHANT_DLLS as $dll) {
+	$dest  = "$dist_dir/$dll[0]";
+	$filename = $dll[1];
+
+	if (!file_exists("$dest") || !is_dir("$dest")) {
+		if (!mkdir("$dest", 0777, true)) {
+			echo "WARNING: couldn't create '$dest' for enchant plugins ";
+		}
+	}
+
+	if (!copy($php_build_dir . '/bin/' . $filename, "$dest/" . basename($filename))) {
+			echo "WARNING: couldn't copy $filename into the dist dir";
+	}
 }
 
 /* and those for pecl */