4 files changed, 13 insertions, 7 deletions
diff --git a/usr/src/lib/pyzfs/Makefile.com b/usr/src/lib/pyzfs/Makefile.com
index 347b4316eb..fd6218e2c4 100644
--- a/usr/src/lib/pyzfs/Makefile.com
+++ b/usr/src/lib/pyzfs/Makefile.com
@@ -35,7 +35,7 @@ include ../../Makefile.lib
 
 LIBLINKS =
 SRCDIR =	../common
-ROOTLIBDIR=	$(ROOT)/usr/lib/python$(PYTHON_VERSION)/vendor-packages/zfs
+ROOTLIBDIR=	$(ROOT)/usr/lib/python$(PYVER)/vendor-packages/zfs
 ROOTLIBDIR64=	$(ROOTLIBDIR)/64
 PYOBJS=		$(PYSRCS:%.py=$(SRCDIR)/%.pyc)
 PYFILES=	$(PYSRCS) $(PYSRCS:%.py=%.pyc)
@@ -45,11 +45,11 @@ CSTD=        $(CSTD_GNU99)
 C99LMODE=       -Xc99=%all
 
 LIBS =		$(DYNLIB)
-LDLIBS +=	-lc -lnvpair -lpython$(PYTHON_VERSION)$(PYTHON_SUFFIX) -lzfs
+LDLIBS +=	-lc -lnvpair -lpython$(PYVER)$(PYSUFFIX) -lzfs
 CFLAGS +=	$(CCVERBOSE)
 CERRWARN +=	-_gcc=-Wno-unused-variable
 CPPFLAGS +=	\
-	-I$(ADJUNCT_PROTO)/usr/include/python$(PYTHON_VERSION)$(PYTHON_SUFFIX)
+	-I$(ADJUNCT_PROTO)/usr/include/python$(PYVER)$(PYSUFFIX)
 CPPFLAGS +=	-I../../../uts/common/fs/zfs
 CPPFLAGS +=	-I../../../common/zfs
 
diff --git a/usr/src/lib/pyzfs/amd64/Makefile b/usr/src/lib/pyzfs/amd64/Makefile
index f3fde27d22..11141ef969 100644
--- a/usr/src/lib/pyzfs/amd64/Makefile
+++ b/usr/src/lib/pyzfs/amd64/Makefile
@@ -14,6 +14,9 @@
 # Copyright 2018 OmniOS Community Edition (OmniOSce) Association.
 #
 
+PYVER = $(PYTHON_VERSION)
+PYSUFFIX = $(PYTHON_SUFFIX)
+
 include ../Makefile.com
 include ../../Makefile.lib.64
 
diff --git a/usr/src/lib/pyzfs/i386/Makefile b/usr/src/lib/pyzfs/i386/Makefile
index 82d8120e69..3c870131dc 100644
--- a/usr/src/lib/pyzfs/i386/Makefile
+++ b/usr/src/lib/pyzfs/i386/Makefile
@@ -23,6 +23,9 @@
 # Copyright 2018 OmniOS Community Edition (OmniOSce) Association.
 #
 
+PYVER = $(PYTHON_VERSION)
+PYSUFFIX = $(PYTHON_SUFFIX)
+
 include ../Makefile.com
 
 all: $(PBOJECT) $(LIBS)
diff --git a/usr/src/lib/pyzfs/py3/Makefile b/usr/src/lib/pyzfs/py3/Makefile
index 27e04f084e..8d9c82dcfb 100644
--- a/usr/src/lib/pyzfs/py3/Makefile
+++ b/usr/src/lib/pyzfs/py3/Makefile
@@ -18,9 +18,9 @@
 include ../Makefile.com
 include ../../Makefile.lib.64
 
-PYTHON = $(PYTHON3)
-PYTHON_VERSION = $(PYTHON3_VERSION)
-PYTHON_SUFFIX = $(PYTHON3_SUFFIX)
+PYSHEBANG = $(PYTHON3)
+PYVER = $(PYTHON3_VERSION)
+PYSUFFIX = $(PYTHON3_SUFFIX)
 
 LDLIBS64 += -L$(ADJUNCT_PROTO)/usr/lib/$(MACH64)
 MAPFILES= $(SRCDIR)/mapfile-py3
@@ -35,5 +35,5 @@ $(ROOTLIBDIR)/%.so: %.so
 
 $(ROOTLIBDIR)/%: ../common/%
 	$(INS.pyfile)
-	$(PYTHON) -mpy_compile $@
+	$(PYTHON3) -mpy_compile $@