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-dist.mk, defs.mk, make.mk: Some more fixes to build system

Browse source 
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2016-01-26 14:43:53 +00:00
commit 118c01e1ba
3 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
make/defs-dist.mk
View file

@ -30,7 +30,7 @@ CTRLDIR ?= $(ENV_PREFIX)/etc/$(FLAVOUR_PATH_PREFIX)init.d
DAEMON_RUN_DIR ?= $(VAR_PREFIX)/corefiles DAEMON_RUN_DIR ?= $(VAR_PREFIX)/corefiles
PROFILE_DIR ?= $(ENV_PREFIX)/etc/$(FLAVOUR_PATH_PREFIX)profile.d PROFILE_DIR ?= $(ENV_PREFIX)/etc/$(FLAVOUR_PATH_PREFIX)profile.d
INSTALL_CRONTABDIR ?= $(ENV_PREFIX)/etc/$(FLAVOUR_PATH_PREFIX)cron.d INSTALL_CRONTABDIR ?= $(ENV_PREFIX)/etc/$(FLAVOUR_PATH_PREFIX)cron.d
INSTALL_PKG_CONFIGDIR ?= $(ENV_PREFIX)/usr/lib/pkgconfig INSTALL_PKG_CONFIGDIR ?= $(ENV_PREFIX)$(SYSTEM_LIBDIR)/pkgconfig
PIDDIR ?= $(VAR_PREFIX)/run PIDDIR ?= $(VAR_PREFIX)/run
DOWNLOADDIRS ?= root@cvs.jannet.de:/usr/local/httpd/htdocs/www.jannet.de_443/$(CUSTOMER)/projects/$(PROJECT) DOWNLOADDIRS ?= root@cvs.jannet.de:/usr/local/httpd/htdocs/www.jannet.de_443/$(CUSTOMER)/projects/$(PROJECT)
WORKING_DIR ?= $(VAR_PREFIX)/coredumps WORKING_DIR ?= $(VAR_PREFIX)/coredumps

3
make/defs.mk
View file

@ -122,12 +122,15 @@ TARGET ?= Linux
ifndef ARCH ifndef ARCH
ifeq ($(shell uname -m),armv7l) ifeq ($(shell uname -m),armv7l)
ARCH = armv7hl ARCH = armv7hl
SYSTEM_LIBDIR = /usr/lib
else else
ifeq ($(shell uname -m),x86_64) ifeq ($(shell uname -m),x86_64)
ARCH = x86_64 ARCH = x86_64
SYSTEM_LIBDIR = /usr/lib64
else else
ARCH_32 = i586 ARCH_32 = i586
ARCH = $(ARCH_32) ARCH = $(ARCH_32)
SYSTEM_LIBDIR = /usr/lib
endif endif
endif endif
endif endif

4
make/make.mk
View file

@ -50,8 +50,8 @@ $(LOCAL_PKG_CONFIG): $(PROJECT_DESCR_FILE) $(MODDIR)/make/make.mk $(MOD_SCRIPT_D
-v $(DIST_VERSION) \ -v $(DIST_VERSION) \
-p $(PROJECT_DIRPATH) \ -p $(PROJECT_DIRPATH) \
-V $(shell echo $(PROJECT) | tr a-z- A-Z_)_DIR=$(PROJECT_DIRPATH) \ -V $(shell echo $(PROJECT) | tr a-z- A-Z_)_DIR=$(PROJECT_DIRPATH) \
-r $(RPM_REQUIRES_RUN) \ -r "$(RPM_REQUIRES_RUN)" \
-R $(RPM_REQUIRES_DEVEL) \ -R "$(RPM_REQUIRES_DEVEL)" \
$(CREATE_PKG_CONFIG_OPTS) \ $(CREATE_PKG_CONFIG_OPTS) \
> $@.tmp > $@.tmp
mv $@.tmp $@ mv $@.tmp $@