Merge m-c to inbound.
authorRyan VanderMeulen <ryanvm@gmail.com>
Sun, 26 Aug 2012 16:03:34 -0400
changeset 105534 74666a1eb791ef2b4447c442556017cc86e59544
parent 105533 260d65801b2255ff61a02af2dd06137d27617c86 (current diff)
parent 105515 2b9625825da7911aba106256c48fa6750fb9cd24 (diff)
child 105535 0a9e931cdcf3ffc4f34bcd440b1f2fe087afa44a
child 105537 49c35b696124cf5fed13aebd79492dd02127d61b
push id55
push usershu@rfrn.org
push dateThu, 30 Aug 2012 01:33:09 +0000
milestone17.0a1
Merge m-c to inbound.
--- a/toolkit/mozapps/installer/packager.mk
+++ b/toolkit/mozapps/installer/packager.mk
@@ -464,17 +464,17 @@ PRECOMPILE_RESOURCE=gre
 PRECOMPILE_GRE=$$PWD
 endif
 
 ifneq (,$(filter WINNT OS2,$(OS_ARCH)))
 # FIXME: not tested on OS/2. Is it using the correct libxul?
 RUN_FROM_PWD = $(_ABS_RUN_TEST_PROGRAM)
 else
 # For non-Windows, just set the library path so we load the libs from the right place.
-ifdef ($(OS_ARCH),Darwin)
+ifeq ($(OS_ARCH),Darwin)
 RUN_FROM_PWD = DYLD_LIBRARY_PATH=$(PRECOMPILE_GRE)
 else
 RUN_FROM_PWD = "$$PWD/run-mozilla.sh"
 endif
 endif
 
 # Silence the unzip step so we don't print any binary data from the comment field.
 GENERATE_CACHE = \