From e06ead38cc89272f9144ba1adc7fc8478027aa27 Mon Sep 17 00:00:00 2001
From: Jan Lindemann <jan@janware.com>
Date: Sat, 21 Nov 2020 13:09:15 +0000
Subject: [PATCH] swig.mk, defs-(dist|dev).mk: Fix Python 3 support

python38.pc doesn't exist on OpenSUSE Tumbleweed, python-38.pc does, so use
that naming scheme. Also allow installation with DEVELOPMENT=true, failed with
the attempt to install as root user before.

Signed-off-by: Jan Lindemann <jan@janware.com>
---
 make/defs-dev.mk  |  3 +++
 make/defs-dist.mk |  3 +++
 make/swig.mk      | 10 +++++-----
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/make/defs-dev.mk b/make/defs-dev.mk
index 2f77d3e8..acfb297a 100644
--- a/make/defs-dev.mk
+++ b/make/defs-dev.mk
@@ -98,6 +98,9 @@ PYMODMODE                   ?= 644
 PYJWBDIROWNER               ?= $(BUILD_USER)
 PYJWBDIRGROUP               ?= $(BUILD_GROUP)
 PYJWBDIRMODE                ?= 755
+SWIG_TARGETOWNER            ?= $(PYMODOWNER)
+SWIG_TARGETGROUP            ?= $(PYMODGROUP)
+SWIG_TARGETMODE             ?= $(PYMODMODE)
 INITOWNER                   ?= $(EXEOWNER)
 INITGROUP                   ?= $(EXEGROUP)
 INITMODE                    ?= $(EXEMODE)
diff --git a/make/defs-dist.mk b/make/defs-dist.mk
index fe10dd7d..ea2e1a1d 100644
--- a/make/defs-dist.mk
+++ b/make/defs-dist.mk
@@ -98,6 +98,9 @@ PYMODMODE                   ?= 644
 PYJWBDIROWNER               ?= root
 PYJWBDIRGROUP               ?= root
 PYJWBDIRMODE                ?= 755
+SWIG_TARGETOWNER            ?= $(PYMODOWNER)
+SWIG_TARGETGROUP            ?= $(PYMODGROUP)
+SWIG_TARGETMODE             ?= $(PYMODMODE)
 INITDIRMODE                 ?= $(EXEDIRMODE)
 INITOWNER                   ?= $(EXEOWNER)
 INITGROUP                   ?= $(EXEGROUP)
diff --git a/make/swig.mk b/make/swig.mk
index 2a436efa..f21cc4a4 100644
--- a/make/swig.mk
+++ b/make/swig.mk
@@ -65,7 +65,7 @@ else ifeq ($(SWIG_TARGET),python)
   SWIG_MODULE_TARGET_DIR     = $(ENV_PREFIX)$(PY_SITE_PACKAGES_PATH)
   SWIG_MODULE_SO            ?= _$(SWIG_MODULE).so
 
-  ifneq ($(PYTHON_VERSION),3)
+  ifneq ($(PYTHON_MAJOR_VERSION),3)
     SWIG_CLEAN              += $(wildcard *.pyc)
     SWIG_PY_MODULE_PYC      ?= $(patsubst %.py,%.pyc,$(SWIG_MODULE_TARGET))
   else
@@ -75,21 +75,21 @@ else ifeq ($(SWIG_TARGET),python)
   SWIG_GENERATED_EXTRA      += $(SWIG_PY_MODULE_PYC)
   SWIG_INSTALLED_EXTRA      += $(SWIG_MODULE_TARGET_DIR)/$(SWIG_PY_MODULE_PYC)
 
-  FINAL_INCLUDE             += $(shell pkg-config --cflags python$(PYTHON_VERSION))
-  FINAL_LDFLAGS             += $(shell pkg-config --libs   python$(PYTHON_VERSION))
+  FINAL_INCLUDE             += $(shell $(PKG_CONFIG_EXE) --cflags python-$(PYTHON_VERSION))
+  FINAL_LDFLAGS             += $(shell $(PKG_CONFIG_EXE) --libs   python-$(PYTHON_VERSION))
 
   INSTALL_LIBDIR             = $(SWIG_MODULE_TARGET_DIR)
 
 all:
 
-ifneq ($(PYTHON_VERSION),3)
+ifneq ($(PYTHON_MAJOR_VERSION),3)
 %.pyc: %.py
 else
 __pycache__/%.$(PY_CPYTHON_PREFIX).pyc: %.py
 endif
 	$(PYTHON) -c "import py_compile; py_compile.compile(\"$<\", doraise=True)"
 
-ifeq ($(PYTHON_VERSION),3)
+ifeq ($(PYTHON_MAJOR_VERSION),3)
 $(SWIG_MODULE_TARGET_DIR)/__pycache__/%.$(PY_CPYTHON_PREFIX).pyc: __pycache__/%.$(PY_CPYTHON_PREFIX).pyc
 	mkdir -p $(dir $@)
 else