janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-26 23:23:55 +01:00
Code Activity

defs.mk: Fix FULL_NAME, add BUILD_HDRDIR_BASE

Browse source 
- Fix FULL_NAME to work in non-/etc/passwd-based setups
  - Add BUILD_HDRDIR_BASE

Signed-off-by: Jan Lindemann <jan@jannet.de>
This commit is contained in:
Jan Lindemann 2013-05-30 12:50:30 +00:00 • committed by Jan Lindemann
commit e6943d8172
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
make/defs.mk
View file

@ -93,7 +93,7 @@ ARCH = x86_64
else else
ARCH = x86 ARCH = x86
endif endif
FULL_NAME = $(shell grep "^`id -nu`": /etc/passwd | cut -d: -f5) FULL_NAME = $(shell id -nu | xargs getent passwd | cut -d: -f5)
DEVELOPMENT ?= $(shell echo $(VERSION) | grep -q 'dev' && echo true) DEVELOPMENT ?= $(shell echo $(VERSION) | grep -q 'dev' && echo true)
USE_PROJECT_LIB ?= true USE_PROJECT_LIB ?= true
USE_YTOOLS ?= true USE_YTOOLS ?= true
@ -270,7 +270,8 @@ INSTALLED_SYSCFG ?= $(addprefix $(INSTALL_SYSCFGDIR)/,$(SYSCFG_FILES))
# -- HDR # -- HDR
INSTALLATION_FILE_TYPES += HDR INSTALLATION_FILE_TYPES += HDR
BUILD_HDRDIR ?= $(TOPDIR)/include/$(HDRDIR_SCOPE_SUFFIX) BUILD_HDRDIR_BASE ?= $(TOPDIR)/include
BUILD_HDRDIR ?= $(BUILD_HDRDIR_BASE)/$(HDRDIR_SCOPE_SUFFIX)
SRC_H += $(filter %.h %.H, $(SRC_ALL_CPP)) SRC_H += $(filter %.h %.H, $(SRC_ALL_CPP))
BUILD_H = $(addprefix $(BUILD_HDRDIR)/,$(SRC_H)) BUILD_H = $(addprefix $(BUILD_HDRDIR)/,$(SRC_H))
BUILD_HDR = $(addprefix $(BUILD_HDRDIR)/,$(SRC_H)) BUILD_HDR = $(addprefix $(BUILD_HDRDIR)/,$(SRC_H))