From d1766ff48dda4053e870fa978ca09dc3d2db71e4 Mon Sep 17 00:00:00 2001
From: "bugzilla%standard8.demon.co.uk" <bugzilla%standard8.demon.co.uk>
Date: Mon, 31 Jul 2006 16:49:30 +0000
Subject: [PATCH] Bug 342897 Copy required suite files from xpfe/bootstrap (and
 elsewhere) to suite/app. r=kairo,sr=Neil

---
 suite/app/Makefile.in     | 31 ++++++++++++++++++-------------
 suite/browser/Makefile.in |  2 ++
 suite/locales/Makefile.in | 22 ++++++++++++++++++++++
 3 files changed, 42 insertions(+), 13 deletions(-)

diff --git a/suite/app/Makefile.in b/suite/app/Makefile.in
index c20ae6424b1..71f1082ced6 100644
--- a/suite/app/Makefile.in
+++ b/suite/app/Makefile.in
@@ -46,15 +46,10 @@ MOZILLA_INTERNAL_API = 1
 
 AB_CD = $(MOZ_UI_LOCALE) 
 
-DEFINES += -DAB_CD=$(AB_CD)
-
-DIRS		= profile
-
-# XXX browser-prefs.js should be moved to within the /suite directory at
-# some sensible stage.
-PREF_JS_EXPORTS = \
-     $(topsrcdir)/xpfe/bootstrap/browser-prefs.js \
-     $(NULL)
+DEFINES += \
+	-DAB_CD=$(AB_CD) \
+	-DAPP_VERSION="$(MOZ_APP_VERSION)" \
+	$(NULL)
 
 ifeq ($(USE_SHORT_LIBNAME), 1)
 PROGRAM = $(MOZ_APP_NAME)$(BIN_SUFFIX)
@@ -149,7 +144,7 @@ endif
 endif
 
 ifeq ($(OS_ARCH),BeOS)
-BEOS_PROGRAM_RESOURCE = $(topsrcdir)/xpfe/bootstrap/apprunner-beos.rsrc
+BEOS_PROGRAM_RESOURCE = apprunner-beos.rsrc
 ifdef BUILD_STATIC_LIBS
 OS_LIBS += -ltracker -lgame
 endif
@@ -165,8 +160,6 @@ ifdef BUILD_STATIC_LIBS
 include $(topsrcdir)/config/static-rules.mk
 endif
 
-DEFINES += -DAPP_VERSION="$(MOZ_APP_VERSION)"
-
 ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
 ifdef BUILD_STATIC_LIBS
 LIBS	+= -framework QuickTime -framework IOKit
@@ -192,7 +185,19 @@ endif
 $(PROGRAM): $(DIST)/lib/$(LIB_PREFIX)xulapp_s.$(LIB_SUFFIX)
 
 ifneq (,$(filter-out OS2 WINNT Darwin,$(OS_ARCH)))
-$(MOZ_APP_NAME):: mozilla.in Makefile.in Makefile $(DEPTH)/config/autoconf.mk
+$(MOZ_APP_NAME).1: seamonkey.man.in Makefile.in Makefile $(DEPTH)/config/autoconf.mk
+	@sed -e "s|\@bindir\@|$(bindir)|g" -e "s|\@mozappdir\@|$(mozappdir)|g" \
+		-e "s|\@MOZ_APP_DISPLAYNAME\@|$(MOZ_APP_DISPLAYNAME)|g" \
+		-e "s|\@MOZ_APP_NAME\@|$(MOZ_APP_NAME)|g" \
+		-e "s|\@MOZ_APP_VERSION\@|${MOZ_APP_VERSION}|g" < $< > $@
+
+libs:: $(MOZ_APP_NAME).1
+	$(INSTALL) $< $(DIST)/man/man1
+
+install:: $(MOZ_APP_NAME).1
+	$(SYSINSTALL) $(IFLAGS1) $< $(DESTDIR)$(mandir)/man1
+
+$(MOZ_APP_NAME):: seamonkey.in Makefile.in Makefile $(DEPTH)/config/autoconf.mk
 	cat $< | sed -e "s|%MOZAPPDIR%|$(mozappdir)|" \
 		-e "s|%MOZ_USER_DIR%|.mozilla|" \
 		-e "s|%MREDIR%|$(mredir)|" \
diff --git a/suite/browser/Makefile.in b/suite/browser/Makefile.in
index bf1f8d42b68..9d65a0aa2af 100644
--- a/suite/browser/Makefile.in
+++ b/suite/browser/Makefile.in
@@ -44,4 +44,6 @@ include $(DEPTH)/config/autoconf.mk
 
 EXTRA_COMPONENTS = nsBrowserContentHandler.js
 
+PREF_JS_EXPORTS = $(srcdir)/browser-prefs.js
+
 include $(topsrcdir)/config/rules.mk
diff --git a/suite/locales/Makefile.in b/suite/locales/Makefile.in
index f188001d409..f4ece844b1c 100644
--- a/suite/locales/Makefile.in
+++ b/suite/locales/Makefile.in
@@ -45,3 +45,25 @@ include $(DEPTH)/config/autoconf.mk
 DEFINES += -DAB_CD=$(AB_CD)
 
 include $(topsrcdir)/config/rules.mk
+
+PROFILE_FILES = \
+	bookmarks.html \
+	mimeTypes.rdf \
+	localstore.rdf \
+	panels.rdf \
+	search.rdf \
+	$(NULL)
+
+PROFILE_CHROME = userChrome-example.css userContent-example.css
+
+libs:: $(addprefix $(LOCALE_SRCDIR)/profile/,$(PROFILE_FILES))
+	$(INSTALL) $^ $(FINAL_TARGET)/defaults/profile
+
+libs:: $(addprefix $(LOCALE_SRCDIR)/profile/chrome/,$(PROFILE_CHROME))
+	$(INSTALL) $^ $(FINAL_TARGET)/defaults/profile/chrome
+
+install:: $(addprefix $(LOCALE_SRCDIR)/profile/,$(PROFILE_FILES))
+	$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/defaults/profile
+
+install:: $(addprefix $(LOCALE_SRCDIR)/profile/chrome/,$(PROFILE_CHROME))
+	$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/defaults/profile/chrome