Fix configure's loading of the branding files to use the defined rather than one obtained by side-effect. r=ted over irc, no bug
authorMark Banner <bugzilla@standard8.plus.com>
Tue, 23 Mar 2010 15:39:55 +0000
changeset 39743 3f694f889f3879c24cd7562b05e038dbc192d37c
parent 39742 a7c62300bbbbf77cc65495593949c867e7a93cf2
child 39744 ca874c58573bcbbf8528eaab72ba5d847ff507b4
push id12374
push userbugzilla@standard8.plus.com
push dateTue, 23 Mar 2010 15:40:34 +0000
treeherdermozilla-central@3f694f889f38 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted
milestone1.9.3a4pre
Fix configure's loading of the branding files to use the defined rather than one obtained by side-effect. r=ted over irc, no bug
configure.in
--- a/configure.in
+++ b/configure.in
@@ -5168,18 +5168,18 @@ MOZ_ARG_WITH_STRING(branding,
 [  --with-branding=dir    Use branding from the specified directory.],
     MOZ_BRANDING_DIRECTORY=$withval)
 
 REAL_BRANDING_DIRECTORY="${MOZ_BRANDING_DIRECTORY}"
 if test -z "$REAL_BRANDING_DIRECTORY"; then
   REAL_BRANDING_DIRECTORY=${MOZ_BUILD_APP}/branding/nightly
 fi
 
-if test -f "$topsrcdir/$REAL_BRANDING_DIRECTORY/configure.sh"; then
-  . "$topsrcdir/$REAL_BRANDING_DIRECTORY/configure.sh"
+if test -f "${_topsrcdir}/$REAL_BRANDING_DIRECTORY/configure.sh"; then
+  . "${_topsrcdir}/$REAL_BRANDING_DIRECTORY/configure.sh"
 fi
 
 AC_SUBST(MOZ_BRANDING_DIRECTORY)
 
 dnl ========================================================
 dnl = Distribution ID
 dnl ========================================================
 MOZ_ARG_WITH_STRING(distribution-id,