diff --git a/browser/base/Makefile.in b/browser/base/Makefile.in index 9315f2a50f42..0031e91c7588 100644 --- a/browser/base/Makefile.in +++ b/browser/base/Makefile.in @@ -62,8 +62,7 @@ EXTRA_JS_MODULES = \ include $(topsrcdir)/config/rules.mk -PRE_RELEASE_SUFFIX := $(shell $(PYTHON) $(topsrcdir)/config/printprereleasesuffix.py \ - $(shell cat $(srcdir)/../config/version.txt)) +PRE_RELEASE_SUFFIX := "" DEFINES += \ -DMOZ_APP_VERSION=$(MOZ_APP_VERSION) \ diff --git a/browser/installer/windows/Makefile.in b/browser/installer/windows/Makefile.in index 2cad3d917699..7e41aea1bbaf 100644 --- a/browser/installer/windows/Makefile.in +++ b/browser/installer/windows/Makefile.in @@ -51,7 +51,7 @@ CONFIG_DIR = instgen SFX_MODULE = $(topsrcdir)/other-licenses/7zstub/firefox/7zSD.sfx APP_VERSION := $(shell cat $(srcdir)/../../config/version.txt) DEFINES += -DAPP_VERSION=$(APP_VERSION) -PRE_RELEASE_SUFFIX := $(shell $(PYTHON) $(topsrcdir)/config/printprereleasesuffix.py $(APP_VERSION)) +PRE_RELEASE_SUFFIX := "" DEFINES += -DPRE_RELEASE_SUFFIX="$(PRE_RELEASE_SUFFIX)" INSTALLER_FILES = \ diff --git a/toolkit/mozapps/installer/package-name.mk b/toolkit/mozapps/installer/package-name.mk index e25835a017ba..5b9870ce1519 100644 --- a/toolkit/mozapps/installer/package-name.mk +++ b/toolkit/mozapps/installer/package-name.mk @@ -112,10 +112,7 @@ MOZ_PKG_APPNAME_LC = $(shell echo $(MOZ_PKG_APPNAME) | tr '[A-Z]' '[a-z]') ifndef MOZ_PKG_LONGVERSION -MOZ_PKG_LONGVERSION = $(shell echo $(MOZ_PKG_VERSION) |\ - sed -e 's/a\([0-9][0-9]*\)$$/ Alpha \1/' |\ - sed -e 's/b\([0-9][0-9]*\)$$/ Beta \1/' |\ - sed -e 's/rc\([0-9][0-9]*\)$$/ RC \1/') +MOZ_PKG_LONGVERSION = $(shell echo $(MOZ_PKG_VERSION)) endif ifeq (,$(filter-out Darwin OS2, $(OS_ARCH))) # Mac and OS2