diff --git a/build/mac/BuildNGLayout.pl b/build/mac/BuildNGLayout.pl
index a5aedb0054e..34d40f55627 100644
--- a/build/mac/BuildNGLayout.pl
+++ b/build/mac/BuildNGLayout.pl
@@ -27,7 +27,8 @@ use Moz;
 
 # configuration variables
 $DEBUG = 0;
-$SHARED = 0;
+$ALIAS_SYM_FILES = $DEBUG;
+
 $pull{all} = 0;
 $pull{lizard} = 0;
 $pull{xpcom} = 0;
@@ -36,10 +37,30 @@ $pull{netlib} = 0;
 $pull{nglayout} = 0;
 $pull{mac} = 0;
 
-$build{all} = 1;
-$build{dist} = 1;
-$build{common}= 1;
-$build{nglayout}= 1;
+$build{all} = 0;
+$build{dist} = 0;
+$build{stubs} = 0;
+$build{common} = 0;
+$build{nglayout} = 1;
+$build{resources} = 1;
+$build{editor} = 1;
+$build{viewer} = 1;
+$build{xpapp} = 1;
+
+if ($pull{all})
+{
+	foreach $k (keys(%pull))
+	{
+		$pull{$k} = 1;
+	}
+}
+if ($build{all})
+{
+	foreach $k (keys(%build))
+	{
+		$build{$k} = 1;
+	}
+}
 
 # do the work
 # you should not have to edit anything bellow
diff --git a/build/mac/BuildNGLayoutDebug.pl b/build/mac/BuildNGLayoutDebug.pl
index 02ccb63bda4..634e4019f1f 100644
--- a/build/mac/BuildNGLayoutDebug.pl
+++ b/build/mac/BuildNGLayoutDebug.pl
@@ -27,7 +27,8 @@ use Moz;
 
 # configuration variables
 $DEBUG = 1;
-$SHARED = 0;
+$ALIAS_SYM_FILES = $DEBUG;
+
 $pull{all} = 0;
 $pull{lizard} = 0;
 $pull{xpcom} = 0;
@@ -36,10 +37,24 @@ $pull{netlib} = 0;
 $pull{nglayout} = 0;
 $pull{mac} = 0;
 
-$build{all} = 1;
-$build{dist} = 1;
-$build{common} = 1;
+$build{all} = 0;
+
+$build{dist} = 0;
+$build{stubs} = 0;
+$build{common} = 0;
 $build{nglayout} = 1;
+$build{resources} = 1;
+$build{editor} = 1;
+$build{viewer} = 1;
+$build{xpapp} = 1;
+
+if ($build{all})
+{
+	foreach $k (keys(%build))
+	{
+		$build{$k} = 1;
+	}
+}
 
 # do the work
 # you should not have to edit anything bellow
diff --git a/build/mac/PullNGlayout.pl b/build/mac/PullNGlayout.pl
index 704e63c9bb7..25c6a9081df 100644
--- a/build/mac/PullNGlayout.pl
+++ b/build/mac/PullNGlayout.pl
@@ -35,12 +35,6 @@ $pull{netlib} = 0;
 $pull{nglayout} = 0;
 $pull{mac} = 0;
 
-$build{all} = 1;
-$build{dist} = 0;
-$build{common}= 0;
-$build{nglayout}= 0;
-
-
 if ($pull{all})
 {
 	foreach $k (keys(%pull))
diff --git a/build/mac/TinderboxNGLayout.pl b/build/mac/TinderboxNGLayout.pl
index 8271ace9fce..93f0420f9ac 100644
--- a/build/mac/TinderboxNGLayout.pl
+++ b/build/mac/TinderboxNGLayout.pl
@@ -28,6 +28,7 @@ use Moz;
 # configuration variables
 
 $DEBUG = 1;
+$ALIAS_SYM_FILES = 0;
 
 $pull{all} = 0;
 $pull{lizard} = 0;
@@ -39,8 +40,13 @@ $pull{mac} = 0;
 
 $build{all} = 0;
 $build{dist} = 0;
-$build{common}= 0;
-$build{nglayout}= 0;
+$build{stubs} = 0;
+$build{common} = 0;
+$build{nglayout} = 0;
+$build{resources} = 0;
+$build{editor} = 0;
+$build{viewer} = 0;
+$build{xpapp} = 0;
 
 
 # script