janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-19 21:27:39 +01:00
Code Activity

$(MODDIR)/make/defs.mk: Replace variable OS with OS_NAME_VERSION

Browse source 
OS_NAME_VERSION is less ambiguous.

Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2019-02-27 10:22:27 +00:00
commit b37359a725
4 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
make/defs.mk
View file

@ -54,7 +54,7 @@ ifeq ($(PROJECT),)
endif
GET_OS_SH ?= /bin/bash $(MOD_SCRIPT_DIR)/get-os.sh
OS ?= $(shell $(GET_OS_SH))
OS_NAME_VERSION ?= $(shell $(GET_OS_SH))
OS_NAME ?= $(shell $(GET_OS_SH) name)
OSTYPE ?= $(shell $(GET_OS_SH) type)
@ -72,7 +72,7 @@ FLAVOUR_PATH_SUFFIX ?= /win32
endif
endif
ifneq ($(filter debian%,$(OS)),)
ifneq ($(filter debian%,$(OS_NAME_VERSION)),)
PKG_FORMAT ?= debian
else
PKG_FORMAT ?= rpm
@ -241,7 +241,7 @@ BUILD_CFLAGS += -DCATCH_ONLY_YERROR
BUILD_CPPFLAGS += -DCATCH_ONLY_YERROR
endif
ifneq ($(shell echo $(OS) | cut -d: -f1),suse-9)
ifneq ($(shell echo $(OS_NAME_VERSION) | cut -d: -f1),suse-9)
SYSCFG_DIR ?= /etc
SYSCFG_FILE ?= /etc/rc.config
else