--- a/allmakefiles.sh
+++ b/allmakefiles.sh
@@ -112,17 +112,16 @@ if [ "$COMPILER_DEPEND" = "" -a "$MOZ_NA
     config/mkdepend/Makefile
   "
 fi
 
 if [ "$ENABLE_MARIONETTE" ]; then
   add_makefiles "
     testing/marionette/Makefile
     testing/marionette/components/Makefile
-    testing/marionette/tests/Makefile
   "
 fi
 
 if [ "$ENABLE_TESTS" ]; then
   add_makefiles "
     build/autoconf/test/Makefile
     config/makefiles/test/Makefile
     config/tests/makefiles/autodeps/Makefile

--- a/build/autoconf/acoutput-fast.pl
+++ b/build/autoconf/acoutput-fast.pl
@@ -134,17 +134,17 @@ foreach $ac_file (@makefiles) {
   if (-e $ac_file) {
     next if -M _ < -M $ac_file_in;
     print STDERR "updating $ac_file\n";
   } else {
     print STDERR "creating $ac_file\n";
   }
 
   open (INFILE, "<$ac_file_in")
-    or ( warn "can't read $ac_file_in: No such file or directory\n" and next);
+    or ( die "can't read $ac_file_in: No such file or directory\n");
   open (OUTFILE, ">$ac_file")
     or ( warn "Unable to create $ac_file\n" and next);
 
   while (<INFILE>) {
     #if (/\@[_a-zA-Z]*\@.*\@[_a-zA-Z]*\@/) {
     #  warn "Two defines on a line:$ac_file:$.:$_";
     #  push @unhandled, $ac_file;
     #  last;

--- a/configure.in
+++ b/configure.in
@@ -8847,16 +8847,20 @@ dnl Run a perl script to quickly create 
 dnl If it succeeds, it outputs a shell command to set CONFIG_FILES
 dnl   for the files it cannot handle correctly. This way, config.status
 dnl   will handle these files.
 dnl If it fails, nothing is set and config.status will run as usual.
 dnl
 dnl This does not change the $MAKEFILES variable.
 dnl
 echo $MAKEFILES | ${PERL} $srcdir/build/autoconf/acoutput-fast.pl > conftest.sh
+res="$?"
+if test "$res" != 0; then
+    exit $res
+fi
 . ./conftest.sh
 rm conftest.sh
 
 echo $MAKEFILES > unallmakefiles
 
 mv -f config/autoconf.mk config/autoconf.mk.orig 2> /dev/null
 
 AC_OUTPUT($MAKEFILES)

--- a/js/src/build/autoconf/acoutput-fast.pl
+++ b/js/src/build/autoconf/acoutput-fast.pl
@@ -134,17 +134,17 @@ foreach $ac_file (@makefiles) {
   if (-e $ac_file) {
     next if -M _ < -M $ac_file_in;
     print STDERR "updating $ac_file\n";
   } else {
     print STDERR "creating $ac_file\n";
   }
 
   open (INFILE, "<$ac_file_in")
-    or ( warn "can't read $ac_file_in: No such file or directory\n" and next);
+    or ( die "can't read $ac_file_in: No such file or directory\n");
   open (OUTFILE, ">$ac_file")
     or ( warn "Unable to create $ac_file\n" and next);
 
   while (<INFILE>) {
     #if (/\@[_a-zA-Z]*\@.*\@[_a-zA-Z]*\@/) {
     #  warn "Two defines on a line:$ac_file:$.:$_";
     #  push @unhandled, $ac_file;
     #  last;

--- a/js/src/configure.in
+++ b/js/src/configure.in
@@ -4659,16 +4659,20 @@ dnl Run a perl script to quickly create 
 dnl If it succeeds, it outputs a shell command to set CONFIG_FILES
 dnl   for the files it cannot handle correctly. This way, config.status
 dnl   will handle these files.
 dnl If it fails, nothing is set and config.status will run as usual.
 dnl
 dnl This does not change the $MAKEFILES variable.
 dnl
 echo $MAKEFILES | ${PERL} $srcdir/build/autoconf/acoutput-fast.pl > conftest.sh
+res="$?"
+if test "$res" != 0; then
+    exit $res
+fi
 . ./conftest.sh
 rm conftest.sh
 
 echo $MAKEFILES > unallmakefiles
 
 mv -f config/autoconf.mk config/autoconf.mk.orig 2> /dev/null
 
 AC_OUTPUT($MAKEFILES)

--- a/toolkit/toolkit-makefiles.sh
+++ b/toolkit/toolkit-makefiles.sh
@@ -571,17 +571,16 @@ if [ "$MOZ_WIDGET_TOOLKIT" = "windows" ]
     toolkit/system/windowsproxy/Makefile
     widget/windows/Makefile
     xpcom/reflect/xptcall/src/md/win32/Makefile
   "
 elif [ "$MOZ_WIDGET_TOOLKIT" = "cocoa" ]; then
   add_makefiles "
     content/xbl/builtin/mac/Makefile
     dom/plugins/ipc/interpose/Makefile
-    dom/system/cocoa/Makefile
     image/decoders/icon/mac/Makefile
     intl/locale/src/mac/Makefile
     netwerk/system/mac/Makefile
     toolkit/system/osxproxy/Makefile
     toolkit/themes/pinstripe/Makefile
     toolkit/themes/pinstripe/global/Makefile
     toolkit/themes/pinstripe/mozapps/Makefile
     toolkit/components/alerts/mac/Makefile
@@ -1122,17 +1121,16 @@ if [ "$MOZ_ANGLE" ]; then
   add_makefiles "
     gfx/angle/src/libGLESv2/Makefile
     gfx/angle/src/libEGL/Makefile
   "
 fi
 
 if [ "$MOZ_B2G_RIL" ]; then
   add_makefiles "
-    dom/system/b2g/Makefile
     dom/telephony/Makefile
     dom/wifi/Makefile
     ipc/ril/Makefile
   "
 fi
 
 if [ "$MOZ_CRASHREPORTER" ]; then
   add_makefiles "

--- a/xulrunner/makefiles.sh
+++ b/xulrunner/makefiles.sh
@@ -3,39 +3,32 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 add_makefiles "
 xulrunner/Makefile
 xulrunner/app/Makefile
 xulrunner/app/profile/Makefile
 xulrunner/app/profile/chrome/Makefile
-xulrunner/app/profile/extensions/Makefile
 xulrunner/examples/Makefile
 xulrunner/examples/simple/Makefile
 xulrunner/examples/simple/components/Makefile
 xulrunner/examples/simple/components/public/Makefile
 xulrunner/examples/simple/components/src/Makefile
 xulrunner/setup/Makefile
 xulrunner/stub/Makefile
 xulrunner/installer/Makefile
 "
 
 if [ "$MAKENSISU" ]; then
   add_makefiles "
     xulrunner/installer/windows/Makefile
   "
 fi
 
-if [ "$OS_ARCH" = "Darwin" ]; then
-  add_makefiles "
-    xulrunner/installer/mac/Makefile
-  "
-fi
-
 if [ "$OS_ARCH" = "WINNT" ]; then
   add_makefiles "
     xulrunner/tools/redit/Makefile
   "
   if [ "$MOZILLA_OFFICIAL" -o "$ENABLE_TESTS" ]; then
     add_makefiles "
       embedding/tests/winEmbed/Makefile
     "