Skip to content

Commit

Permalink
Merge pull request #2772 from camptocamp/21-makefile-ngeo
Browse files Browse the repository at this point in the history
Fix the CGXP interface test
  • Loading branch information
sbrunner authored Jan 25, 2017
2 parents 00fd387 + 862a8aa commit f4d02a4
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion c2cgeoportal/scaffolds/update/CONST_Makefile_tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ export DEVELOPMENT
LANGUAGES ?= en fr de
NGEO_INTERFACES ?= desktop mobile
CGXP_INTERFACES ?=
CGXP_API ?= TRUE
INTERFACES += $(NGEO_INTERFACES) $(CGXP_INTERFACES)
export INTERFACES
# Used print version
Expand Down Expand Up @@ -79,8 +80,12 @@ C2CCSSMIN_VERSION ?= $(shell grep ^c2c.cssmin== CONST_optional-requirements.txt

GIT_MODULES_FOLDER ?= .git/modules/

ifneq ($(CGXP_INTERFACES), "")
ifdef CGXP_INTERFACES
DEFAULT_WEB_RULE += build-cgxp
else
ifeq ($(CGXP_API), TRUE)
DEFAULT_WEB_RULE += build-cgxp
endif
endif
ifneq ($(NGEO_INTERFACES), "")
DEFAULT_WEB_RULE += build-ngeo
Expand Down

0 comments on commit f4d02a4

Please sign in to comment.