From 503136b46c8e376920cd8980e09ae85e9cc6d91f Mon Sep 17 00:00:00 2001 From: "benjamin%smedbergs.us" Date: Wed, 25 Apr 2007 01:17:44 +0000 Subject: [PATCH] Bug 378627 - Allow firefox --enable-libxul to be packaged like a static build, r=luser git-svn-id: svn://10.0.0.236/trunk@224979 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/browser/installer/Makefile.in | 4 ++-- mozilla/browser/installer/unix/packages-static | 1 + mozilla/browser/installer/windows/packages-static | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/mozilla/browser/installer/Makefile.in b/mozilla/browser/installer/Makefile.in index 70f1e9538b1..d47d018bc26 100644 --- a/mozilla/browser/installer/Makefile.in +++ b/mozilla/browser/installer/Makefile.in @@ -58,7 +58,7 @@ include $(topsrcdir)/config/rules.mk MOZ_PKG_REMOVALS = $(srcdir)/removed-files.in -ifdef BUILD_STATIC_LIBS +ifneq (,$(BUILD_STATIC_LIBS)$(MOZ_ENABLE_LIBXUL)) ifeq (WINNT,$(OS_ARCH)) MOZ_PKG_MANIFEST_P = $(srcdir)/windows/packages-static else @@ -67,7 +67,7 @@ MOZ_PKG_MANIFEST_P = $(srcdir)/unix/packages-static endif endif else -$(error you need a "--enable-static --disable-shared" build to create an installer) +$(error you need a "--enable-static or --enable-libxul" build to create an installer) endif MOZ_NONLOCALIZED_PKG_LIST = \ diff --git a/mozilla/browser/installer/unix/packages-static b/mozilla/browser/installer/unix/packages-static index 9d5f8c99eb1..7acbc946b5e 100644 --- a/mozilla/browser/installer/unix/packages-static +++ b/mozilla/browser/installer/unix/packages-static @@ -35,6 +35,7 @@ bin/libxpcom.so bin/libxpcom_core.so bin/libxpistub.so bin/libnspr4.so +bin/libxul.so bin/components/libxpinstall.so bin/components/libjar50.so diff --git a/mozilla/browser/installer/windows/packages-static b/mozilla/browser/installer/windows/packages-static index 668395a9099..ca3e6066bb7 100644 --- a/mozilla/browser/installer/windows/packages-static +++ b/mozilla/browser/installer/windows/packages-static @@ -35,6 +35,7 @@ bin\xpcom.dll bin\xpcom_core.dll bin\xpistub.dll bin\nspr4.dll +bin\xul.dll bin\components\xpinstal.dll bin\components\jar50.dll bin\Microsoft.VC80.CRT.manifest