mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 755724 - Use DIST_SUBDIR for XPIs too. r=ted

This commit is contained in:
Mike Hommey 2012-12-11 16:37:07 +01:00
Родитель a5afd16146
Коммит 37f0dbe164
2 изменённых файлов: 6 добавлений и 6 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

6
config/config.mk
Просмотреть файл

@ -76,9 +76,9 @@ LIBXUL_DIST ?= $(DIST)
# build products (typelibs, components, chrome).
#
# If XPI_NAME is set, the files will be shipped to $(DIST)/xpi-stage/$(XPI_NAME)
# If DIST_SUBDIR is set, the files will be shipped to $(DIST)/$(DIST_SUBDIR)
# Otherwise, the default $(DIST)/bin will be used.
FINAL_TARGET = $(if $(XPI_NAME),$(DIST)/xpi-stage/$(XPI_NAME),$(if $(DIST_SUBDIR),$(DIST)/bin/$(DIST_SUBDIR),$(DIST)/bin))
# instead of $(DIST)/bin. In both cases, if DIST_SUBDIR is set, the files will be
# shipped to a $(DIST_SUBDIR) subdirectory.
FINAL_TARGET = $(if $(XPI_NAME),$(DIST)/xpi-stage/$(XPI_NAME),$(DIST)/bin)$(DIST_SUBDIR:%=/%)
ifdef XPI_NAME
DEFINES += -DXPI_NAME=$(XPI_NAME)

6
js/src/config/config.mk
Просмотреть файл

@ -76,9 +76,9 @@ LIBXUL_DIST ?= $(DIST)
# build products (typelibs, components, chrome).
#
# If XPI_NAME is set, the files will be shipped to $(DIST)/xpi-stage/$(XPI_NAME)
# If DIST_SUBDIR is set, the files will be shipped to $(DIST)/$(DIST_SUBDIR)
# Otherwise, the default $(DIST)/bin will be used.
FINAL_TARGET = $(if $(XPI_NAME),$(DIST)/xpi-stage/$(XPI_NAME),$(if $(DIST_SUBDIR),$(DIST)/bin/$(DIST_SUBDIR),$(DIST)/bin))
# instead of $(DIST)/bin. In both cases, if DIST_SUBDIR is set, the files will be
# shipped to a $(DIST_SUBDIR) subdirectory.
FINAL_TARGET = $(if $(XPI_NAME),$(DIST)/xpi-stage/$(XPI_NAME),$(DIST)/bin)$(DIST_SUBDIR:%=/%)
ifdef XPI_NAME
DEFINES += -DXPI_NAME=$(XPI_NAME)