--- a/calendar/installer/Makefile.in
+++ b/calendar/installer/Makefile.in
@@ -92,16 +92,21 @@ MOZ_PKG_MANIFEST = packages-static
endif
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
MOZ_PKG_MAC_DSSTORE=branding/dsstore
MOZ_PKG_MAC_BACKGROUND=branding/background.png
MOZ_PKG_MAC_ICON=branding/disk.icns
endif
+
+# On mozilla-central, packager.mk uses core_abspath to redefine DIST
+# As the comm-central config.mk doesn't set it, do it ourselves instead
+core_abspath = $(if $(findstring :,$(1)),$(1),$(if $(filter /%,$(1)),$(1),$(CURDIR)/$(1)))
+
include $(MOZILLA_SRCDIR)/toolkit/mozapps/installer/packager.mk
ifeq (WINNT,$(OS_ARCH))
PKGCOMP_FIND_OPTS =
else
PKGCOMP_FIND_OPTS = -L
endif
@@ -115,10 +120,9 @@ endif
installer: removed-files
ifdef INSTALLER_DIR
$(MAKE) -C $(INSTALLER_DIR)
endif
make-package : removed-files-checked
removed-files-checked : removed-files stage-package
- $(PERL) $(srcdir)/check-remove-files.pl removed-files $(DIST)/bin
-
+ $(PERL) $(srcdir)/check-remove-files.pl removed-files $(DIST)/$(MOZ_PKG_APPNAME)