From 917f6ac0f499d9e5bbc87c1d7bb1f0299dedbd75 Mon Sep 17 00:00:00 2001
From: Myk Melez <myk@mozilla.org>
Date: Mon, 7 May 2012 10:45:53 -0700
Subject: [PATCH] bug 751375 - structure webapp runtime Makefiles correctly;
 r=bsmedberg

---
 webapprt/Makefile.in     | 7 +++++--
 webapprt/mac/Makefile.in | 4 ++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/webapprt/Makefile.in b/webapprt/Makefile.in
index a8cf22d54d2..64d18ad9aed 100644
--- a/webapprt/Makefile.in
+++ b/webapprt/Makefile.in
@@ -7,14 +7,17 @@ topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
+include $(DEPTH)/config/autoconf.mk
+
+DIRS = $(NULL)
+
+# Include config.mk explicitly so we can override FINAL_TARGET.
 include $(topsrcdir)/config/config.mk
 
 # config.mk sets FINAL_TARGET to $(DIST)/bin, but we want to copy build products
 # into a WebappRT-specific subdirectory, so we redefine it here.
 FINAL_TARGET = $(DIST)/bin/webapprt
 
-DIRS = $(NULL)
-
 ifneq (,$(filter WINNT,$(OS_ARCH)))
 DIRS += win
 else
diff --git a/webapprt/mac/Makefile.in b/webapprt/mac/Makefile.in
index f11efee1178..3c9f18801cf 100644
--- a/webapprt/mac/Makefile.in
+++ b/webapprt/mac/Makefile.in
@@ -7,12 +7,12 @@ topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
+include $(DEPTH)/config/autoconf.mk
+
 # This switches $(INSTALL) to copy mode, like $(SYSINSTALL), so things that
 # shouldn't get 755 perms need $(IFLAGS1) for either way of calling nsinstall.
 NSDISTMODE = copy
 
-include $(topsrcdir)/config/config.mk
-
 PROGRAM = webapprt-stub$(BIN_SUFFIX)
 
 CMMSRCS = webapprt.mm