diff options
| author | Alexander Pyhalov <apyhalov@gmail.com> | 2016-08-30 12:55:15 +0300 |
|---|---|---|
| committer | Gordon Ross <gordon.w.ross@gmail.com> | 2016-09-29 22:49:32 -0400 |
| commit | 9f9230833b50b8271840dc2c12bd1e94d9df7d12 (patch) | |
| tree | d674face6d7ae05e652e1ffeed7c0ce37cc32f86 /usr/src/lib/pysolaris | |
| parent | 8ae05c101a3c849364fa53a66ec87aa59823326a (diff) | |
| download | illumos-joyent-9f9230833b50b8271840dc2c12bd1e94d9df7d12.tar.gz | |
5969 update illumos-gate to use python2.7
Portions contributed by: Igor Kozhukhov <ikozhukhov@gmail.com>
Reviewed by: Andrew Stormont <astormont@racktopsystems.com>
Reviewed by: Albert Lee <trisk@omniti.com>
Reviewed by: Adam Stevko <adam.stevko@gmail.com>
Approved by: Gordon Ross <gwr@nexenta.com>
Diffstat (limited to 'usr/src/lib/pysolaris')
| -rw-r--r-- | usr/src/lib/pysolaris/Makefile.com | 10 | ||||
| -rw-r--r-- | usr/src/lib/pysolaris/common/__init__.py | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/usr/src/lib/pysolaris/Makefile.com b/usr/src/lib/pysolaris/Makefile.com index 28d68704f9..7423665381 100644 --- a/usr/src/lib/pysolaris/Makefile.com +++ b/usr/src/lib/pysolaris/Makefile.com @@ -32,20 +32,19 @@ include ../../Makefile.lib LIBLINKS = SRCDIR = ../common -ROOTLIBDIR= $(ROOT)/usr/lib/python2.6/vendor-packages/solaris +ROOTLIBDIR= $(ROOT)/usr/lib/python$(PYTHON_VERSION)/vendor-packages/solaris PYOBJS= $(PYSRCS:%.py=$(SRCDIR)/%.pyc) PYFILES= $(PYSRCS) $(PYSRCS:%.py=%.pyc) ROOTPYSOLFILES= $(PYFILES:%=$(ROOTLIBDIR)/%) -PYTHON= $(PYTHON_26) C99MODE= -xc99=%all C99LMODE= -Xc99=%all LIBS = $(DYNLIB) -LDLIBS += -lc -lsec -lidmap -lpython2.6 +LDLIBS += -lc -lsec -lidmap -lpython$(PYTHON_VERSION) CFLAGS += $(CCVERBOSE) CERRWARN += -_gcc=-Wno-unused-variable -CPPFLAGS += -I$(ADJUNCT_PROTO)/usr/include/python2.6 +CPPFLAGS += -I$(ADJUNCT_PROTO)/usr/include/python$(PYTHON_VERSION) .KEEP_STATE: @@ -56,6 +55,9 @@ install: all $(ROOTPYSOLFILES) $(ROOTLIBDIR)/%: % $(INS.pyfile) +$(ROOTLIBDIR)/%: ../common/% + $(INS.pyfile) + lint: lintcheck include ../../Makefile.targ diff --git a/usr/src/lib/pysolaris/common/__init__.py b/usr/src/lib/pysolaris/common/__init__.py index 1119f0645a..c811dbb347 100644 --- a/usr/src/lib/pysolaris/common/__init__.py +++ b/usr/src/lib/pysolaris/common/__init__.py @@ -1,4 +1,4 @@ -#! /usr/bin/python2.6 +#!@PYTHON@ # # CDDL HEADER START # |