bug 494621 - Don't package dist/bin/README.txt on Mac, r=mcsmurf
authorRobert Kaiser <kairo@kairo.at>
Sun, 24 May 2009 01:47:18 +0200
changeset 2695 b0f2034767c78a12d786a805a5b7bee3ac37a45a
parent 2694 fc20fe4e7a4ef9094356696d9d07f58f2cb5e748
child 2696 dda4761749ba0d053941562c0bc26b06ccdb8d5b
push idunknown
push userunknown
push dateunknown
reviewersmcsmurf
bugs494621
bug 494621 - Don't package dist/bin/README.txt on Mac, r=mcsmurf
suite/installer/Makefile.in
suite/locales/Makefile.in
--- a/suite/installer/Makefile.in
+++ b/suite/installer/Makefile.in
@@ -91,17 +91,17 @@ MOZ_PKG_MANIFEST = packages
 endif
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
 MOZ_PKG_MAC_DSSTORE=branding/dsstore
 MOZ_PKG_MAC_BACKGROUND=branding/background.png
 MOZ_PKG_MAC_ICON=branding/disk.icns
 MOZ_PKG_MAC_EXTRA=--format UDBZ \
                   --symlink "/Applications: " \
-                  --copy "bin/README.txt"
+                  --copy "$(call EXPAND_LOCALE_SRCDIR,suite/locales)/installer/mac/README.txt"
 endif
 
 include $(MOZILLA_SRCDIR)/toolkit/mozapps/installer/packager.mk
 
 ifeq (WINNT,$(OS_ARCH))
 PKGCOMP_FIND_OPTS = 
 else
 PKGCOMP_FIND_OPTS = -L
--- a/suite/locales/Makefile.in
+++ b/suite/locales/Makefile.in
@@ -213,17 +213,17 @@ libs-%:
 	@$(MAKE) tests AB_CD=$*
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
 MOZ_PKG_MAC_DSSTORE=$(_ABS_DIST)/branding/dsstore
 MOZ_PKG_MAC_BACKGROUND=$(_ABS_DIST)/branding/background.png
 MOZ_PKG_MAC_ICON=$(_ABS_DIST)/branding/disk.icns
 MOZ_PKG_MAC_EXTRA=--format UDBZ \
                   --symlink "/Applications: " \
-                  --copy "$(_ABS_DIST)/bin/README.txt"
+                  --copy "$(LOCALE_SRCDIR)/installer/mac/README.txt"
 endif
 
 PACKAGER_NO_LIBS = 1
 include $(MOZILLA_SRCDIR)/toolkit/mozapps/installer/packager.mk
 
 repackage-win32-installer: WIN32_INSTALLER_OUT="$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe"
 repackage-win32-installer: $(WIN32_INSTALLER_IN) $(SUBMAKEFILES)
 	@echo "Repackaging $(WIN32_INSTALLER_IN) into $(WIN32_INSTALLER_OUT)."