diff -Naur mozilla-release/config/baseconfig.mk mozilla-release-magellan/config/baseconfig.mk
--- mozilla-release/config/baseconfig.mk	2014-06-06 03:15:19.000000000 +0200
+++ mozilla-release-magellan/config/baseconfig.mk	2014-07-21 15:28:02.810643532 +0200
@@ -2,10 +2,10 @@
 # directly in python/mozbuild/mozbuild/base.py for gmake validation.
 # We thus use INCLUDED_AUTOCONF_MK to enable/disable some parts depending
 # whether a normal build is happening or whether the check is running.
-includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
+includedir := $(includedir)/$(MOZ_APP_NAME)-esr
+idldir = $(datadir)/idl/$(MOZ_APP_NAME)-esr
+installdir = $(libdir)/$(MOZ_APP_NAME)-esr
+sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-esr
 ifndef TOP_DIST
 TOP_DIST = dist
 endif