Bug 542222 - Followup fix for Reduce recursion in makefiles. r=rstrong

other-licenses/bsdiff/Makefile.in

@@ -36,10 +36,10 @@
 #
 # ***** END LICENSE BLOCK *****
 
-DEPTH		= ../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
+DEPTH     = ../..
+topsrcdir = @top_srcdir@
+srcdir    = @srcdir@
+VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
@@ -53,7 +53,7 @@ ifeq (WINNT,$(OS_ARCH))
 HOST_EXTRA_LIBS += $(call EXPAND_LIBNAME,Ws2_32)
 endif
 
-LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/mozapps/update/src/updater
+LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/mozapps/update/updater
 
 include $(topsrcdir)/config/rules.mk
 

toolkit/content/license.html

@@ -2002,8 +2002,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     <h1><a name="bspatch"></a>bspatch License</h1>
 
     <p class="correctme">This license applies to the files 
-    <span class="path">toolkit/mozapps/update/src/updater/bspatch.cpp</span> and
-    <span class="path">toolkit/mozapps/update/src/updater/bspatch.h</span>.
+    <span class="path">toolkit/mozapps/update/updater/bspatch.cpp</span> and
+    <span class="path">toolkit/mozapps/update/updater/bspatch.h</span>.
     </p>
 
 <pre>

xpcom/glue/nsCRTGlue.cpp

@@ -13,7 +13,7 @@
  *
  * The Original Code is Mozilla Application Update.
  * This file is based on code originally located at
- * mozilla/toolkit/mozapps/update/src/updater/updater.cpp
+ * mozilla/toolkit/mozapps/update/updater/updater.cpp
  *
  * The Initial Developer of the Original Code is
  * Benjamin Smedberg <benjamin@smedbergs.us>

xpcom/glue/nsINIParser.cpp

@@ -72,7 +72,7 @@ inline FILE *TS_tfopen (const char *path, const char *mode)
 #endif
 
 // Stack based FILE wrapper to ensure that fclose is called, copied from
-// toolkit/mozapps/update/src/updater/readstrings.cpp
+// toolkit/mozapps/update/updater/readstrings.cpp
 
 class AutoFILE {
 public: