diff --git a/make/defs.mk b/make/defs.mk
index 2c57dc21..6f104fc3 100644
--- a/make/defs.mk
+++ b/make/defs.mk
@@ -93,7 +93,7 @@ ARCH                   = x86_64
 else
 ARCH                   = x86
 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)
 USE_PROJECT_LIB       ?= true
 USE_YTOOLS            ?= true
@@ -270,7 +270,8 @@ INSTALLED_SYSCFG      ?= $(addprefix $(INSTALL_SYSCFGDIR)/,$(SYSCFG_FILES))
 
 # -- 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))
 BUILD_H                = $(addprefix $(BUILD_HDRDIR)/,$(SRC_H))
 BUILD_HDR              = $(addprefix $(BUILD_HDRDIR)/,$(SRC_H))