From b37359a7257a0f42cd5b501dffbf52c456bc195a Mon Sep 17 00:00:00 2001
From: Jan Lindemann <jan@janware.com>
Date: Wed, 27 Feb 2019 10:22:27 +0000
Subject: [PATCH] $(MODDIR)/make/defs.mk: Replace variable OS with
 OS_NAME_VERSION

OS_NAME_VERSION is less ambiguous.

Signed-off-by: Jan Lindemann <jan@janware.com>
---
 doc/packaging/add-pkg-conflicts-support.patch | 4 ++--
 make/defs.mk                                  | 6 +++---
 make/rpmdist.mk                               | 8 ++++----
 make/upload-defs-rpm.mk                       | 4 ++--
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/doc/packaging/add-pkg-conflicts-support.patch b/doc/packaging/add-pkg-conflicts-support.patch
index 26c1e7aa..1c62b5fe 100644
--- a/doc/packaging/add-pkg-conflicts-support.patch
+++ b/doc/packaging/add-pkg-conflicts-support.patch
@@ -13,8 +13,8 @@ diff -u -r1.137 rpmdist.mk
 +RPM_CONFLICTS_DEVEL      += $(call proj_query, pkg-conflicts --dont-expand-version-macros $(PROJ_QUERY_PKG_CONFLICTS_EXTRA_ARGS) devel $(PROJECT))
 +RPM_CONFLICTS_RUN        += $(call proj_query, pkg-conflicts --dont-expand-version-macros $(PROJ_QUERY_PKG_CONFLICTS_EXTRA_ARGS) run   $(PROJECT))
  
- RPM_UPLOAD_OS_NAME        = $(shell echo $(OS) | sed 's/-.*//')
- RPM_UPLOAD_OS_VERSION     = $(shell echo $(OS) | sed 's/[^-]\+-//')
+ RPM_UPLOAD_OS_NAME        = $(shell echo $(OS_NAME_VERSION) | sed 's/-.*//')
+ RPM_UPLOAD_OS_VERSION     = $(shell echo $(OS_NAME_VERSION) | sed 's/[^-]\+-//')
 @@ -88,8 +89,9 @@
  include $(MODDIR)/make/upload-rules.mk
  
diff --git a/make/defs.mk b/make/defs.mk
index 8bf9fa21..35331b08 100644
--- a/make/defs.mk
+++ b/make/defs.mk
@@ -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
diff --git a/make/rpmdist.mk b/make/rpmdist.mk
index 55879392..7b40fed2 100644
--- a/make/rpmdist.mk
+++ b/make/rpmdist.mk
@@ -23,13 +23,13 @@ FTP_DIR_MODE             ?= 755
 FTP_HOST_LOGIN           ?= root
 RELEASES_FILE     = $(TOPDIR)/RELEASES$(FLAVOUR_SUFFIX)
 RELEASES         ?= $(shell $(PKG_SH_EXE) version \
-	-p $(OS)/$(RPM_ARCH) $(RELEASES_FILE) read | $(SED) 's/-dev//')
+	-p $(OS_NAME_VERSION)/$(RPM_ARCH) $(RELEASES_FILE) read | $(SED) 's/-dev//')
 RPMBUILD                 ?= pkgbuild
 CHECK_CVS_SYNC_BEFORE_RPM_RELEASE ?= true
 HASH                      = $(shell $(cvs_files) -z | \
 	grep -vz "CHANGES\|VERSION\|HASH\|MD5SUMS\|RELEASES" | \
 	xargs -0 md5sum | md5sum | $(SED) 's/ .*//')
-LOCAL_REPO               ?= /srv/dav/pub/local/packages/suse/$(OS)
+LOCAL_REPO               ?= /srv/dav/pub/local/packages/suse/$(OS_NAME_VERSION)
 
 include $(MODDIR)/make/tag-defs.mk
 
@@ -89,8 +89,8 @@ RPM_CONFLICTS_RUN        += $(call proj_query, pkg-conflicts --dont-expand-versi
 RPM_PROVIDES_DEVEL       += $(call proj_query, pkg-provides  --dont-expand-version-macros $(PROJ_QUERY_PKG_PROVIDES_EXTRA_ARGS)  devel $(PROJECT))
 RPM_PROVIDES_RUN         += $(call proj_query, pkg-provides  --dont-expand-version-macros $(PROJ_QUERY_PKG_PROVIDES_EXTRA_ARGS)  run   $(PROJECT))
 
-RPM_UPLOAD_OS_NAME        = $(shell echo $(OS) | sed 's/-.*//')
-RPM_UPLOAD_OS_VERSION     = $(shell echo $(OS) | sed 's/[^-]\+-//')
+RPM_UPLOAD_OS_NAME        = $(shell echo $(OS_NAME_VERSION) | sed 's/-.*//')
+RPM_UPLOAD_OS_VERSION     = $(shell echo $(OS_NAME_VERSION) | sed 's/[^-]\+-//')
 RPM_UPLOAD_URLPREFIX      ?= rsync_ssh://root@pkg.janware.com:/srv/dav/pub/packages/linux/$(RPM_UPLOAD_OS_NAME)/$(RPM_UPLOAD_OS_VERSION)
 RPM_UPLOAD_USER           ?= $(shell id -un)
 RPM_UPLOAD_GROUP          ?= $(shell id -gn)
diff --git a/make/upload-defs-rpm.mk b/make/upload-defs-rpm.mk
index 65bfd54b..0190ca43 100644
--- a/make/upload-defs-rpm.mk
+++ b/make/upload-defs-rpm.mk
@@ -17,8 +17,8 @@
 #FTP_HOST         ?= pkg.janware.com
 #FTP_HOST_LOGIN   ?= root
 #
-#OS_NAME = $(shell echo $(OS) | sed 's/-.*//')
-#OS_VERSION = $(shell echo $(OS) | sed 's/[^-]\+-//')
+#OS_NAME = $(shell echo $(OS_NAME_VERSION) | sed 's/-.*//')
+#OS_VERSION = $(shell echo $(OS_NAME_VERSION) | sed 's/[^-]\+-//')
 #
 ## $(FTP_PCKG_DIR)/linux/$(OS_NAME)/$(OS_VERSION)/rpm/src
 #FTP_PCKG_DIR             ?= /pub/packages