From 214615796d2248d6f4f643948cf22c192f51ffd8 Mon Sep 17 00:00:00 2001 From: Patrick Cloke Date: Wed, 8 Jan 2014 20:48:47 -0500 Subject: [PATCH] Bug 956609 - Land the IM front-end in comm-central: Port bug 928966, switch core_abspath to $(abspath), r=florian. --- im/content/Makefile.in | 2 +- im/locales/Makefile.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/im/content/Makefile.in b/im/content/Makefile.in index 93ae9d46e2..567a457854 100644 --- a/im/content/Makefile.in +++ b/im/content/Makefile.in @@ -25,6 +25,6 @@ ifdef MOZ_UPDATER DEFINES += -DMOZ_UPDATER=1 endif -abs_srcdir = $(call core_abspath,$(srcdir)) +abs_srcdir = $(abspath $(srcdir)) CHROME_DEPS += $(abs_srcdir)/overrides/app-license.html DEFINES += -DAPP_LICENSE_BLOCK=$(abs_srcdir)/overrides/app-license.html diff --git a/im/locales/Makefile.in b/im/locales/Makefile.in index e89d1c0e32..9de64aa921 100644 --- a/im/locales/Makefile.in +++ b/im/locales/Makefile.in @@ -17,7 +17,7 @@ DEFINES += -DMOZ_APP_MAXVERSION=$(MOZ_APP_MAXVERSION) vpath %.xml @srcdir@/en-US/searchplugins vpath %.xml $(LOCALE_SRCDIR)/searchplugins -_ABS_SRCDIR := $(call core_abspath,$(topsrcdir)) +_ABS_SRCDIR := $(abspath $(topsrcdir)) ifndef MOZ_BRANDING_DIRECTORY MOZ_BRANDING_DIRECTORY = im/branding/nightly