Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 03:15:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset cff5a22acb7c (bug 924992) for breaking upload_symbolds on Nightlies

Browse Source
This commit is contained in:
Ed Morley 2013-10-11 17:47:55 +01:00
parent ce891d2c00
commit 79aac1d02b
5 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
config/baseconfig.mk
View File

@ -2,12 +2,7 @@ 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)
ifndef INCLUDED_FUNCTIONS_MK
include $(topsrcdir)/config/makefiles/functions.mk
endif
DIST := $(call core_realpath,$(DEPTH)/dist)
DIST = $(DEPTH)/dist
# We do magic with OBJ_SUFFIX in config.mk, the following ensures we don't
# manually use it before config.mk inclusion

4
config/config.mk
View File

@ -64,6 +64,10 @@ check-variable = $(if $(filter-out 0 1,$(words $($(x))z)),$(error Spaces are not
$(foreach x,$(CHECK_VARS),$(check-variable))
ifndef INCLUDED_FUNCTIONS_MK
include $(topsrcdir)/config/makefiles/functions.mk
endif
RM = rm -f
# LIBXUL_DIST is not defined under js/src, thus we make it mean DIST there.

10
js/src/config/baseconfig.mk
View File

@ -1,17 +1,13 @@
installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
ifndef INCLUDED_FUNCTIONS_MK
include $(topsrcdir)/config/makefiles/functions.mk
endif
ifneq (,$(filter /%,$(TOP_DIST)))
DIST := $(call core_realpath,$(TOP_DIST))
DIST = $(TOP_DIST)
else
ifeq (.,$(DEPTH))
DIST := $(call core_realpath,$(TOP_DIST))
DIST = $(TOP_DIST)
else
DIST := $(call core_realpath,$(DEPTH)/$(TOP_DIST))
DIST = $(DEPTH)/$(TOP_DIST)
endif
endif

4
js/src/config/config.mk
View File

@ -64,6 +64,10 @@ check-variable = $(if $(filter-out 0 1,$(words $($(x))z)),$(error Spaces are not
$(foreach x,$(CHECK_VARS),$(check-variable))
ifndef INCLUDED_FUNCTIONS_MK
include $(topsrcdir)/config/makefiles/functions.mk
endif
RM = rm -f
# LIBXUL_DIST is not defined under js/src, thus we make it mean DIST there.

2
security/build/Makefile.in
View File

@ -12,6 +12,8 @@ endif
default::
include $(topsrcdir)/config/makefiles/functions.mk
NSS_LIBS = \
nss3 \
nssutil3 \