janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-15 12:03:31 +01:00
Code Activity

defs*.mk: Add PROJECTS_DIR

Browse source 
PROJECTS_DIR is a new variable to abstract away differences from
DEVELOPMENT == true or false.

Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2016-01-28 13:02:42 +00:00
commit 7436e9799b
3 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
make/defs-dev.mk
View file

@ -6,6 +6,7 @@
# -- files # -- files
#CONTRIBDIR ?= $(TOPDIR)/contrib #CONTRIBDIR ?= $(TOPDIR)/contrib
PROJECT_DIRNAME ?= $(PROJECT) PROJECT_DIRNAME ?= $(PROJECT)
PROJECTS_DIR ?= $(CVS_PROJ_DIR)
PROJECT_DIRPATH ?= $(shell readlink -f $(TOPDIR)) PROJECT_DIRPATH ?= $(shell readlink -f $(TOPDIR))
PREFIX ?= $(ENV_PREFIX)$(HOME)/dat/test/$(FLAVOUR_PREFIX)$(PROJECT_DIRNAME)-$(VERSION) PREFIX ?= $(ENV_PREFIX)$(HOME)/dat/test/$(FLAVOUR_PREFIX)$(PROJECT_DIRNAME)-$(VERSION)
VAR_PREFIX ?= $(PREFIX)/var VAR_PREFIX ?= $(PREFIX)/var

1
make/defs-dist.mk
View file

@ -6,6 +6,7 @@
# -- files # -- files
#CONTRIBDIR ?= $(TOPDIR)/contrib #CONTRIBDIR ?= $(TOPDIR)/contrib
PROJECT_DIRNAME ?= $(PROJECT) PROJECT_DIRNAME ?= $(PROJECT)
PROJECTS_DIR ?= /opt
PROJECT_DIRPATH ?= /opt/$(FLAVOUR_PATH_PREFIX)$(PROJECT_DIRNAME) PROJECT_DIRPATH ?= /opt/$(FLAVOUR_PATH_PREFIX)$(PROJECT_DIRNAME)
PREFIX ?= $(ENV_PREFIX)$(PROJECT_DIRPATH) PREFIX ?= $(ENV_PREFIX)$(PROJECT_DIRPATH)
VAR_PREFIX ?= $(ENV_PREFIX)/var/$(FLAVOUR_PATH_PREFIX)lib VAR_PREFIX ?= $(ENV_PREFIX)/var/$(FLAVOUR_PATH_PREFIX)lib

2
make/defs.mk
View file

@ -710,7 +710,7 @@ define install_links
done; done;
endef endef
proj_query = $(shell python $(MOD_SCRIPT_DIR)/projects.py -p $(CVS_PROJ_DIR) $(1)) proj_query = $(shell python $(MOD_SCRIPT_DIR)/projects.py -p $(PROJECTS_DIR) $(1))
proj_dir = $(call proj_query,proj-dir $(1)) proj_dir = $(call proj_query,proj-dir $(1))
# ----- local.mk # ----- local.mk