From 3509f66d1881194da6dacfba7bb592ee7d13b5f0 Mon Sep 17 00:00:00 2001 From: Florian Franzmann Date: Thu, 12 Dec 2013 23:27:13 +0100 Subject: [PATCH] remove version number from thunderbird's installation path --- config/baseconfig.mk | 8 ++++---- mozilla/config/baseconfig.mk | 8 ++++---- mozilla/js/src/config/baseconfig.mk | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/config/baseconfig.mk b/config/baseconfig.mk index 636b9aa..fe36c48 100644 --- a/config/baseconfig.mk +++ b/config/baseconfig.mk @@ -1,9 +1,9 @@ INCLUDED_AUTOCONF_MK = 1 -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 MOZILLA_SRCDIR = $(topsrcdir)/mozilla MOZDEPTH = $(DEPTH)/mozilla DIST = $(MOZDEPTH)/dist diff --git a/mozilla/config/baseconfig.mk b/mozilla/config/baseconfig.mk index ae69bae..c452e84 100644 --- a/mozilla/config/baseconfig.mk +++ b/mozilla/config/baseconfig.mk @@ -1,9 +1,9 @@ INCLUDED_AUTOCONF_MK = 1 -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 DIST = $(DEPTH)/dist # We do magic with OBJ_SUFFIX in config.mk, the following ensures we don't diff --git a/mozilla/js/src/config/baseconfig.mk b/mozilla/js/src/config/baseconfig.mk index 6ca9f60..9262ac1 100644 --- a/mozilla/js/src/config/baseconfig.mk +++ b/mozilla/js/src/config/baseconfig.mk @@ -1,7 +1,7 @@ INCLUDED_AUTOCONF_MK = 1 -installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) +installdir = $(libdir)/$(MOZ_APP_NAME) +sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel ifneq (,$(filter /%,$(TOP_DIST))) DIST = $(TOP_DIST) -- 1.8.5.1