--- comm-release/mozilla/config/baseconfig.mk.orig	2015-01-23 20:45:09.482758354 +0000

+++ comm-release/mozilla/config/baseconfig.mk	2015-01-23 20:45:47.046714726 +0000

@@ -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)

+idldir = $(datadir)/idl/$(MOZ_APP_NAME)

+installdir = $(libdir)/$(MOZ_APP_NAME)

+sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel

 ifeq (.,$(DEPTH))

 DIST = dist

 else