bug 485860: change automation to also post en-US xpi, just like any other locale -- don't override PKG_LANGPACK_PATH when generating en-US langpack. r=ted, a=bsmedberg/approval2.0+

browser/installer/Makefile.in

@@ -124,9 +124,7 @@ endif
 DEFINES += -DBINPATH=$(BINPATH)
 
 libs::
-	$(MAKE) -C $(DEPTH)/browser/locales langpack PKG_LANGPACK_PATH=
-
-UPLOAD_EXTRA_FILES += $(PKG_LANGPACK_BASENAME).xpi
+	$(MAKE) -C $(DEPTH)/browser/locales langpack
 
 ifeq (WINNT,$(OS_ARCH))
 PKGCOMP_FIND_OPTS =

toolkit/mozapps/installer/packager.mk

@@ -597,6 +597,7 @@ upload:
 		$(call QUOTED_WILDCARD,$(DIST)/$(PKG_PATH)$(SYMBOL_ARCHIVE_BASENAME).zip) \
 		$(call QUOTED_WILDCARD,$(DIST)/$(SDK)) \
 		$(call QUOTED_WILDCARD,$(DIST)/$(PKG_PATH)/$(PKG_BASENAME).txt) \
+		$(call QUOTED_WILDCARD,$(DIST)/$(LANGPACK)) \
 		$(if $(UPLOAD_EXTRA_FILES), $(foreach f, $(UPLOAD_EXTRA_FILES), $(wildcard $(DIST)/$(f))))
 
 ifndef MOZ_PKG_SRCDIR