bug 453840: remove MOZ_PKG_PRETTYNAMES special case in browser/locales/Makefile.in. r=tmielczarek
authorBen Hearsum <bhearsum@mozilla.com>
Fri, 05 Dec 2008 12:01:26 -0500
changeset 22376 5b62f3c644cb52694bafad756daae042d4d0ecf0
parent 22375 53326bcc01580f16d9dd39d3929602b5a2d1ae24
child 22377 3437821306fbb2c907f62cb1b1988d5347c7a784
push id3947
push userbhearsum@mozilla.com
push dateFri, 05 Dec 2008 17:05:17 +0000
treeherdermozilla-central@5b62f3c644cb [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerstmielczarek
bugs453840
milestone1.9.2a1pre
bug 453840: remove MOZ_PKG_PRETTYNAMES special case in browser/locales/Makefile.in. r=tmielczarek
browser/locales/Makefile.in
--- a/browser/locales/Makefile.in
+++ b/browser/locales/Makefile.in
@@ -273,27 +273,16 @@ else
 # ... and windows doesn't like removing STAGEDIST itself, remove all children
 	if test -d $(DIST)/l10n-stage; then \
 	  find $(STAGEDIST) -maxdepth 1 -print0 | xargs -0 $(RM) -r ; \
 	fi
 endif
 	$(NSINSTALL) -D $(DIST)/l10n-stage
 	cd $(DIST)/l10n-stage && \
 	  $(UNMAKE_PACKAGE)
-ifdef MOZ_PKG_PRETTYNAMES
-ifneq (,$(filter WINNT Linux,$(OS_ARCH)))
-# Linux and Windows unpack to a directory named after the MOZ_APP_NAME
-# they were built with. This is fine when when MOZ_PKG_PRETTYNAMES
-# isn't defined, because MOZ_PKG_APPNAME will be the same as MOZ_APP_NAME.
-# However, when MOZ_PKG_PRETTYNAMES is passed MOZ_PKG_APPNAME inherits
-# from MOZ_PKG_DISPLAYNAME, which is not always the same as MOZ_APP_NAME.
-	cd $(DIST)/l10n-stage && \
-      mv $(MOZ_APP_NAME) $(MOZ_PKG_APPNAME)
-endif
-endif
 	make clobber-zip AB_CD=en-US
 
 clobber-zip:
 	$(RM) $(STAGEDIST)/chrome/$(AB_CD).jar \
 	  $(STAGEDIST)/chrome/$(AB_CD).manifest \
 	  $(STAGEDIST)/defaults/pref/firefox-l10n.js
 	$(RM) -r $(STAGEDIST)/microsummary-generators \
 	  $(STAGEDIST)/searchplugins \