Commit | Line | Data |
---|---|---|
c1fcc872 VM |
1 | diff -Nur mozilla-beta.orig/config/baseconfig.mk mozilla-beta/config/baseconfig.mk |
2 | --- mozilla-beta.orig/config/baseconfig.mk 2014-01-14 20:37:43.142280922 +0100 | |
3 | +++ mozilla-beta/config/baseconfig.mk 2014-01-14 20:38:40.184259453 +0100 | |
4 | @@ -1,7 +1,7 @@ | |
5 | -includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) | |
6 | -idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) | |
7 | -installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) | |
8 | -sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) | |
9 | +includedir := $(includedir)/$(MOZ_APP_NAME) | |
10 | +idldir = $(datadir)/idl/$(MOZ_APP_NAME) | |
11 | +installdir = $(libdir)/$(MOZ_APP_NAME) | |
12 | +sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel | |
13 | DIST = $(DEPTH)/dist | |
14 | ||
15 | # We do magic with OBJ_SUFFIX in config.mk, the following ensures we don't | |
16 | diff -Nur mozilla-beta.orig/js/src/config/baseconfig.mk mozilla-beta/js/src/config/baseconfig.mk | |
17 | --- mozilla-beta.orig/js/src/config/baseconfig.mk 2014-01-14 20:37:43.732301391 +0100 | |
18 | +++ mozilla-beta/js/src/config/baseconfig.mk 2014-01-14 20:39:12.769389327 +0100 | |
19 | @@ -1,5 +1,5 @@ | |
20 | -installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) | |
21 | -sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) | |
22 | +installdir = $(libdir)/$(MOZ_APP_NAME) | |
23 | +sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel | |
24 | ||
25 | ifneq (,$(filter /%,$(TOP_DIST))) | |
26 | DIST = $(TOP_DIST) | |
27 |