Added patch to fix build failure (introduced by makefile rewrite).

debian/changelog

@@ -9,6 +9,7 @@ wine-staging (1.7.54) UNRELEASED; urgency=low
   * Added patch for implementation of additional HSTRING functions.
   * Added patches for memory allocation cleanup in gdiplus functions.
   * Added patch to implement hal.KeQueryPerformanceCounter.
+  * Added patch to fix build failure (introduced by makefile rewrite).
   * Removed patch to implement kernel32.GetPhysicallyInstalledSystemMemory
     (accepted upstream).
   * Partially removed patches for ws2_32 TransmitFile (accepted upstream).

patches/makefiles-Fix_Build/0001-makefiles-Use-correct-source-path-for-ttf-install-ru.patch

@@ -0,0 +1,26 @@
+From e8f45ee1fb9530fd798d68ae5eeb34190d1de1ff Mon Sep 17 00:00:00 2001
+From: Sebastian Lackner <sebastian@fds-team.de>
+Date: Thu, 29 Oct 2015 21:22:16 +0100
+Subject: makefiles: Use correct source path for ttf install rules.
+
+Signed-off-by: Sebastian Lackner <sebastian@fds-team.de>
+---
+ tools/makedep.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tools/makedep.c b/tools/makedep.c
+index 30bbc3e..c15f0ac 100644
+--- a/tools/makedep.c
++++ b/tools/makedep.c
+@@ -2057,7 +2057,7 @@ static struct strarray output_sources( struct makefile *make, struct strarray *t
+             }
+             if (source->file->flags & FLAG_INSTALL)
+             {
+-                strarray_add( &make->install_lib_rules, ttf_file );
++                strarray_add( &make->install_lib_rules, strmake( "%s.ttf", obj ));
+                 strarray_add( &make->install_lib_rules, strmake( "D$(fontdir)/%s.ttf", obj ));
+             }
+             if (source->file->flags & FLAG_SFD_FONTS)
+-- 
+2.6.1
+

patches/makefiles-Fix_Build/0002-makefiles-Symlinks-have-no-dependencies-on-source-fi.patch

@@ -0,0 +1,31 @@
+From d0b101227ad133d8b011a3c5b13e8967d7656abe Mon Sep 17 00:00:00 2001
+From: Sebastian Lackner <sebastian@fds-team.de>
+Date: Thu, 29 Oct 2015 21:22:24 +0100
+Subject: makefiles: Symlinks have no dependencies on source files.
+
+Signed-off-by: Sebastian Lackner <sebastian@fds-team.de>
+---
+ tools/makedep.c | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/tools/makedep.c b/tools/makedep.c
+index c15f0ac..cbf0d48 100644
+--- a/tools/makedep.c
++++ b/tools/makedep.c
+@@ -1796,8 +1796,11 @@ static void output_install_rules( struct makefile *make, struct strarray files,
+     if (!files.count) return;
+ 
+     for (i = 0; i < files.count; i += 2)
+-        if (files.str[i + 1][0] >= 'a' && files.str[i + 1][0] <= 'z')  /* only for files in object dir */
+-            strarray_add_uniq( &targets, files.str[i] );
++    {
++        if (files.str[i + 1][0] < 'a' || files.str[i + 1][0] > 'z') continue;  /* only for files in object dir */
++        if (files.str[i + 1][0] == 'y') continue;  /* symlinks have no dependencies on source files */
++        strarray_add_uniq( &targets, files.str[i] );
++    }
+ 
+     output( "install %s::", target );
+     output_filenames_obj_dir( make, targets );
+-- 
+2.6.1
+

patches/makefiles-Fix_Build/definition

@@ -0,0 +1 @@
+Apply-Before: *

patches/patchinstall.sh

@@ -165,6 +165,7 @@ patch_enable_all ()
 	enable_libs_Debug_Channel="$1"
 	enable_libs_Unicode_Collation="$1"
 	enable_makedep_PARENTSPEC="$1"
+	enable_makefiles_Fix_Build="$1"
 	enable_mfplat_MFTRegister="$1"
 	enable_mmdevapi_AEV_Stubs="$1"
 	enable_mountmgr_DosDevices="$1"
@@ -591,6 +592,9 @@ patch_enable ()
 		makedep-PARENTSPEC)
 			enable_makedep_PARENTSPEC="$2"
 			;;
+		makefiles-Fix_Build)
+			enable_makefiles_Fix_Build="$2"
+			;;
 		mfplat-MFTRegister)
 			enable_mfplat_MFTRegister="$2"
 			;;
@@ -2053,6 +2057,20 @@ if test "$enable_patchlist" -eq 1; then
 fi
 
 
+# Patchset makefiles-Fix_Build
+# |
+# | Modified files:
+# |   *	tools/makedep.c
+# |
+if test "$enable_makefiles_Fix_Build" -eq 1; then
+	patch_apply makefiles-Fix_Build/0001-makefiles-Use-correct-source-path-for-ttf-install-ru.patch
+	patch_apply makefiles-Fix_Build/0002-makefiles-Symlinks-have-no-dependencies-on-source-fi.patch
+	(
+		echo '+    { "Sebastian Lackner", "makefiles: Use correct source path for ttf install rules.", 1 },';
+		echo '+    { "Sebastian Lackner", "makefiles: Symlinks have no dependencies on source files.", 1 },';
+	) >> "$patchlist"
+fi
+
 # Patchset Compiler_Warnings
 # |
 # | Modified files: