|
@@ -65,8 +65,22 @@ diff --git a/suite/locales/Makefile.in b/suite/locales/Makefile.in
|
|
# pulls. You may override them if you provide your own files.
|
|
# pulls. You may override them if you provide your own files.
|
|
ZIP_IN ?= $(ABS_DIST)/$(PACKAGE)
|
|
ZIP_IN ?= $(ABS_DIST)/$(PACKAGE)
|
|
|
|
|
|
-@@ -96,35 +96,35 @@ libs:: $(FINAL_TARGET)/defaults/profile/
|
|
|
|
- libs:: $(call MERGE_FILES,$(addprefix profile/chrome/,$(PROFILE_CHROME)))
|
|
|
|
|
|
+@@ -85,46 +85,46 @@ PANELS_XTRA_FILE = $(call MERGE_FILE,pro
|
|
|
|
+ $(NSINSTALL) -D profile
|
|
|
|
+ cp $^ profile/
|
|
|
|
+ sed \
|
|
|
|
+ -n 's/.*<RDF:Description about="\(.*\)">.*/ <RDF:li resource="\1"\/>/p' \
|
|
|
|
+ profile/panels.extra > profile/panels-urn.inc
|
|
|
|
+ $(call py_action,preprocessor, \
|
|
|
|
+ profile/panels.rdf.in -o $@)
|
|
|
|
+
|
|
|
|
+-libs:: $(FINAL_TARGET)/defaults/profile/bookmarks.html ;
|
|
|
|
+-libs:: $(FINAL_TARGET)/defaults/profile/panels.rdf ;
|
|
|
|
++misc:: $(FINAL_TARGET)/defaults/profile/bookmarks.html ;
|
|
|
|
++misc:: $(FINAL_TARGET)/defaults/profile/panels.rdf ;
|
|
|
|
+
|
|
|
|
+-libs:: $(call MERGE_FILES,$(addprefix profile/chrome/,$(PROFILE_CHROME)))
|
|
|
|
++misc:: $(call MERGE_FILES,$(addprefix profile/chrome/,$(PROFILE_CHROME)))
|
|
$(SYSINSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)/defaults/profile/chrome
|
|
$(SYSINSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)/defaults/profile/chrome
|
|
|
|
|
|
# Extend l10n.mk clobber-% target for our localised extensions
|
|
# Extend l10n.mk clobber-% target for our localised extensions
|
|
@@ -106,7 +120,7 @@ diff --git a/suite/locales/Makefile.in b/suite/locales/Makefile.in
|
|
repackage-extensions: $(STAGEDIST)
|
|
repackage-extensions: $(STAGEDIST)
|
|
ifdef MOZ_IRC
|
|
ifdef MOZ_IRC
|
|
$(MAKE) -C ../extensions/irc/locales repackage-zip-$(AB_CD) STAGEDIST=$(STAGEDIST)
|
|
$(MAKE) -C ../extensions/irc/locales repackage-zip-$(AB_CD) STAGEDIST=$(STAGEDIST)
|
|
-@@ -137,17 +137,17 @@ langpack: langpack-$(AB_CD)
|
|
|
|
|
|
+@@ -137,27 +137,27 @@ langpack: langpack-$(AB_CD)
|
|
# builds, and repack and installer if applicable. It is called from the
|
|
# builds, and repack and installer if applicable. It is called from the
|
|
# tinderbox scripts. Alter it with caution.
|
|
# tinderbox scripts. Alter it with caution.
|
|
installers-%: IS_LANGUAGE_REPACK=1
|
|
installers-%: IS_LANGUAGE_REPACK=1
|
|
@@ -125,3 +139,14 @@ diff --git a/suite/locales/Makefile.in b/suite/locales/Makefile.in
|
|
endif
|
|
endif
|
|
@echo 'repackaging done'
|
|
@echo 'repackaging done'
|
|
|
|
|
|
|
|
+ ifdef MOZ_UPDATER
|
|
|
|
+-libs:: $(call MERGE_FILE,updater/updater.ini) $(call mkdir_deps,$(DIST)/bin)
|
|
|
|
++misc:: $(call MERGE_FILE,updater/updater.ini) $(call mkdir_deps,$(DIST)/bin)
|
|
|
|
+ ifeq ($(OS_ARCH),WINNT)
|
|
|
|
+ cat $< $(srcdir)/../installer/windows/nsis/updater_append.ini | \
|
|
|
|
+ sed -e 's/^InfoText=/Info=/' -e 's/^TitleText=/Title=/' | \
|
|
|
|
+ sed -e 's/%MOZ_APP_DISPLAYNAME%/$(MOZ_APP_DISPLAYNAME)/' > \
|
|
|
|
+ $(FINAL_TARGET)/updater.ini
|
|
|
|
+ else
|
|
|
|
+ cat $< | \
|
|
|
|
+ sed -e 's/^InfoText=/Info=/' -e 's/^TitleText=/Title=/' | \
|