diff --git a/Makefile.in b/Makefile.in --- a/Makefile.in +++ b/Makefile.in @@ -16,17 +16,17 @@ NO_JS_MANIFEST = 1 EXTRA_COMPONENTS = js/lib/chatzilla-service.js DIST_FILES = xpi/resources/install.rdf CHATZILLA_VERSION=$(shell grep "const __cz_version" "$(srcdir)/xul/content/static.js" | sed "s|.*\"\([^\"]\{1,\}\)\".*|\1|") XPI_NAME = chatzilla USE_EXTENSION_MANIFEST = 1 NO_JAR_AUTO_REG = 1 -INSTALL_EXTENSION_ID = "{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}" +INSTALL_EXTENSION_ID = {59c81df5-4b7a-477b-912d-4e0fdf64e5f2} XPI_PKGNAME = chatzilla-$(CHATZILLA_VERSION) # include config.mk before using the AB_CD var it sets in an if statement include $(topsrcdir)/config/config.mk # always build en-US locale, add build locale if supported BUILD_LOCALES = en-US ifneq (,$(filter $(AB_CD),$(shell cat $(srcdir)/locales/all-locales))) diff --git a/ff/Makefile.in b/ff/Makefile.in --- a/ff/Makefile.in +++ b/ff/Makefile.in @@ -9,12 +9,12 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk CHATZILLA_VERSION=$(shell grep "const __cz_version" "$(srcdir)/../xul/content/static.js" | sed "s|.*\"\([^\"]\{1,\}\)\".*|\1|") XPI_NAME = chatzilla USE_EXTENSION_MANIFEST = 1 NO_JAR_AUTO_REG = 1 -INSTALL_EXTENSION_ID = "{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}" +INSTALL_EXTENSION_ID = {59c81df5-4b7a-477b-912d-4e0fdf64e5f2} XPI_PKGNAME = chatzilla-$(CHATZILLA_VERSION) include $(topsrcdir)/config/rules.mk diff --git a/locales/Makefile.in b/locales/Makefile.in --- a/locales/Makefile.in +++ b/locales/Makefile.in @@ -11,17 +11,17 @@ VPATH=@srcdir@ relativesrcdir = extensions/irc/locales CHATZILLA_VERSION=$(shell grep "const __cz_version" "$(srcdir)/../xul/content/static.js" | sed "s|.*\"\([^\"]\{1,\}\)\".*|\1|") CHATZILLA_BASE_VERSION=$(shell echo "$(CHATZILLA_VERSION)" | sed "s|\([0-9]\{1,\}\.[0-9]\{1,\}\.[0-9]\{1,\}\).*|\1|") XPI_NAME = chatzilla USE_EXTENSION_MANIFEST = 1 NO_JAR_AUTO_REG = 1 -INSTALL_EXTENSION_ID = "{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}" +INSTALL_EXTENSION_ID = {59c81df5-4b7a-477b-912d-4e0fdf64e5f2} XPI_PKGNAME = chatzilla-$(CHATZILLA_VERSION) # include config.mk before we override the AB_CD var it sets include $(topsrcdir)/config/config.mk STANDALONE_MAKEFILE := 1 # if the wanted language is not in all-locales, fall back to en-US @@ -39,17 +39,17 @@ DIST_FILES = generic/install XULAPP_DEFINES = \ $(DEFINES) \ $(ACDEFINES) \ -I$(call EXPAND_LOCALE_SRCDIR,toolkit/locales)/defines.inc \ -I$(LOCALE_SRCDIR)/defines.inc \ $(NULL) endif -DEFINES += -DINSTALL_EXTENSION_ID=$(INSTALL_EXTENSION_ID) +DEFINES += -DINSTALL_EXTENSION_ID=$("INSTALL_EXTENSION_ID") DEFINES += -DCHATZILLA_VERSION=$(CHATZILLA_VERSION) DEFINES += -DCHATZILLA_BASE_VERSION=$(CHATZILLA_BASE_VERSION) include $(topsrcdir)/config/rules.mk ifneq (en-US,$(AB_CD)) libs realchrome:: @echo "Comparing $(AB_CD) to en-US" diff --git a/sm/Makefile.in b/sm/Makefile.in --- a/sm/Makefile.in +++ b/sm/Makefile.in @@ -9,12 +9,12 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk CHATZILLA_VERSION=$(shell grep "const __cz_version" "$(srcdir)/../xul/content/static.js" | sed "s|.*\"\([^\"]\{1,\}\)\".*|\1|") XPI_NAME = chatzilla USE_EXTENSION_MANIFEST = 1 NO_JAR_AUTO_REG = 1 -INSTALL_EXTENSION_ID = "{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}" +INSTALL_EXTENSION_ID = {59c81df5-4b7a-477b-912d-4e0fdf64e5f2} XPI_PKGNAME = chatzilla-$(CHATZILLA_VERSION) include $(topsrcdir)/config/rules.mk