Annotation of /trunk/mozilla-firefox/patches/firefox-18.0-install-dir.patch
Parent Directory | Revision Log
Revision 2025 -
(hide annotations)
(download)
Thu Jan 10 17:39:06 2013 UTC (11 years, 8 months ago) by niro
File size: 1383 byte(s)
Thu Jan 10 17:39:06 2013 UTC (11 years, 8 months ago) by niro
File size: 1383 byte(s)
-fix install dirs
1 | niro | 2025 | diff -Nur mozilla-release.orig/config/baseconfig.mk mozilla-release/config/baseconfig.mk |
2 | --- mozilla-release.orig/config/baseconfig.mk 2012-10-09 07:34:41.762092280 +0000 | ||
3 | +++ mozilla-release/config/baseconfig.mk 2012-10-09 07:40:53.052771576 +0000 | ||
4 | @@ -1,9 +1,9 @@ | ||
5 | INCLUDED_AUTOCONF_MK = 1 | ||
6 | |||
7 | -includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) | ||
8 | -idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) | ||
9 | -installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) | ||
10 | -sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) | ||
11 | +includedir := $(includedir)/$(MOZ_APP_NAME) | ||
12 | +idldir = $(datadir)/idl/$(MOZ_APP_NAME) | ||
13 | +installdir = $(libdir)/$(MOZ_APP_NAME) | ||
14 | +sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel | ||
15 | DIST = $(DEPTH)/dist | ||
16 | |||
17 | # We do magic with OBJ_SUFFIX in config.mk, the following ensures we don't | ||
18 | diff -Nur mozilla-release.orig/js/src/config/baseconfig.mk mozilla-release/js/src/config/baseconfig.mk | ||
19 | --- mozilla-release.orig/js/src/config/baseconfig.mk 2012-10-09 07:34:58.411973276 +0000 | ||
20 | +++ mozilla-release/js/src/config/baseconfig.mk 2012-10-09 07:39:55.143186168 +0000 | ||
21 | @@ -1,7 +1,7 @@ | ||
22 | INCLUDED_AUTOCONF_MK = 1 | ||
23 | |||
24 | -installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) | ||
25 | -sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) | ||
26 | +installdir = $(libdir)/$(MOZ_APP_NAME) | ||
27 | +sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel | ||
28 | |||
29 | ifneq (,$(filter /%,$(TOP_DIST))) | ||
30 | DIST = $(TOP_DIST) |