Bug 595616 - The INSTALLER_DIR variable is defined to directories that don't exist anymore; r=ted.mielczarek
authorFlorian Quèze <florian@queze.net>
Sun, 12 Sep 2010 04:21:00 -0700
changeset 67587 0d464ee2a517cd94631193bd852c74b3ee06e0b9
parent 67586 6ed8cbde3273c1686484aa07d622d900160ffa94
child 67588 a9bb55a25b8cd07c1233f2a7c1be89964172e856
push id19390
push usereakhgari@mozilla.com
push dateWed, 06 Apr 2011 23:41:23 +0000
treeherdermozilla-central@4a3d11e05c8e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted
bugs595616
milestone2.2a1pre
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 595616 - The INSTALLER_DIR variable is defined to directories that don't exist anymore; r=ted.mielczarek
toolkit/mozapps/installer/packager.mk
--- a/toolkit/mozapps/installer/packager.mk
+++ b/toolkit/mozapps/installer/packager.mk
@@ -61,26 +61,18 @@ else
           MOZ_PKG_FORMAT = TGZ
       endif
    endif
 endif
 endif
 endif
 endif # MOZ_PKG_FORMAT
 
-ifeq ($(OS_ARCH),OS2)
-INSTALLER_DIR   = os2
-else
 ifneq (,$(filter WINNT WINCE,$(OS_ARCH)))
 INSTALLER_DIR   = windows
-else
-ifneq (cocoa,$(MOZ_WIDGET_TOOLKIT))
-INSTALLER_DIR   = unix
-endif
-endif
 endif
 
 PACKAGE       = $(PKG_PATH)$(PKG_BASENAME)$(PKG_SUFFIX)
 
 # By default, the SDK uses the same packaging type as the main bundle,
 # but on mac it is a .tar.bz2
 SDK_PATH      = $(PKG_PATH)
 ifeq ($(MOZ_APP_NAME),xulrunner)