From 79bc967a0dd1319035f0b915759eb86a49007f8d Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Mon, 22 Sep 2008 20:20:02 -0400 Subject: [PATCH] [build] Make including Makefile.win32.features files more robust By using top_srcdir if available. Make's include is relative to current dir, not the Makefile being processed. That makes it hard to include Makefile's relatively. --- build/aclocal.makefile.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/aclocal.makefile.m4 b/build/aclocal.makefile.m4 index 29fb07a2d..584776cab 100644 --- a/build/aclocal.makefile.m4 +++ b/build/aclocal.makefile.m4 @@ -71,7 +71,7 @@ AC_DEFUN([CAIRO_CONFIG_MAKEFILE_PRIVATE], dnl Accumulators CAIRO_ACCUMULATORS_REGISTER(MAKEFILE_$1_AMAKE, m4_newline, [# Generated by configure. Do not edit.]m4_newline[include $(top_srcdir)/$2/Makefile.sources]m4_newline)dnl - CAIRO_ACCUMULATORS_REGISTER(MAKEFILE_$1_WIN32, m4_newline, [# Generated by configure. Do not edit.]m4_newline[include Makefile.sources]m4_newline)dnl + CAIRO_ACCUMULATORS_REGISTER(MAKEFILE_$1_WIN32, m4_newline, [# Generated by configure. Do not edit.]m4_newline[ifeq ($(top_srcdir),)]m4_newline[include Makefile.sources]m4_newline[else]m4_newline[include $(top_srcdir)/$2/Makefile.sources]m4_newline[endif]m4_newline)dnl dnl Generate CAIRO_CONFIG_COMMANDS([$srcdir/$2/Makefile.am.features],