From 4cd467403f7572a0c401553e883fbc98f0785f9a Mon Sep 17 00:00:00 2001
From: Vladimir Vukicevic <vladimir@pobox.com>
Date: Fri, 2 Jul 2010 11:20:29 -0700
Subject: [PATCH] =?UTF-8?q?b=3D=3F;=20fix=20make-makefile=20and=20cairo-fe?=
 =?UTF-8?q?atures.h.in=20hack;=20r=3Dted?=

---
 build/autoconf/make-makefile    | 4 +++-
 gfx/cairo/cairo/src/Makefile.in | 5 +++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/build/autoconf/make-makefile b/build/autoconf/make-makefile
index 57fcdb255570..94a5497da559 100755
--- a/build/autoconf/make-makefile
+++ b/build/autoconf/make-makefile
@@ -170,7 +170,9 @@ sub parse_arguments {
   foreach $makefile (@args) {
     $makefile =~ s/\.in$//;
     $makefile =~ s/\/$//;
-    $makefile =~ /Makefile$/ or $makefile .= "/Makefile";
+    $makefile =~ /Makefile$/
+	or $makefile =~ /^\.\//
+	or $makefile .= "/Makefile";
     push @makefiles, "$makefile";
   }
   @makefiles = "Makefile" unless @args;
diff --git a/gfx/cairo/cairo/src/Makefile.in b/gfx/cairo/cairo/src/Makefile.in
index 72ac283a2583..47cf691d8c9d 100644
--- a/gfx/cairo/cairo/src/Makefile.in
+++ b/gfx/cairo/cairo/src/Makefile.in
@@ -43,8 +43,6 @@ VPATH           = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-SUBMAKEFILES	+= cairo-features.h
-
 ifndef MOZ_ENABLE_LIBXUL
 VISIBILITY_FLAGS =
 endif
@@ -252,3 +250,6 @@ endif
 ifdef MOZ_TREE_CAIRO
 DEFINES += -DMOZ_TREE_CAIRO
 endif
+
+cairo-features.h: $(srcdir)/cairo-features.h.in $(GLOBAL_DEPS)
+	$(PERL) $(AUTOCONF_TOOLS)/make-makefile -t $(topsrcdir) -d $(DEPTH) ./$@