[1/2] makefiles: Use correct source path for ttf install rules.

Sebastian Lackner sebastian at fds-team.de
Thu Oct 29 15:22:16 CDT 2015


Signed-off-by: Sebastian Lackner <sebastian at fds-team.de>
---

Fixes a install failure when using out-of-tree builds.
ttf_file already is a src_dir_path.

I haven't tested yet if those patches really fix ALL build issues
introduced by the recent commits, but to ensure that everything works
correctly until tomorrow, I will share those as early as possible.
If further fixes are necessary I'll resend the whole series.

 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



More information about the wine-patches mailing list