diff options
| author | Xiao-Long Chen <chenxiaolong@cxl.epac.to> | 2013-11-27 14:53:57 +0100 |
|---|---|---|
| committer | Martin Kosek <mkosek@redhat.com> | 2014-01-03 09:46:05 +0100 |
| commit | 5e96fbc22afa02f08f71513e7b59d3d5c6a1f9dc (patch) | |
| tree | dfca5a74b65ee88f7e9ccb868bc7c99b01f739af /ipapython | |
| parent | 2a2f5ac4e68ed9a819ddc3de1d35366b2e2b58c7 (diff) | |
| download | freeipa-5e96fbc22afa02f08f71513e7b59d3d5c6a1f9dc.tar.gz freeipa-5e96fbc22afa02f08f71513e7b59d3d5c6a1f9dc.tar.xz freeipa-5e96fbc22afa02f08f71513e7b59d3d5c6a1f9dc.zip | |
Use /usr/bin/python2
Part of the effort to port FreeIPA to Arch Linux,
where Python 3 is the default.
FreeIPA hasn't been ported to Python 3, so the code must be modified to
run /usr/bin/python2
https://fedorahosted.org/freeipa/ticket/3438
Updated by pviktori@redhat.com
Diffstat (limited to 'ipapython')
| -rw-r--r-- | ipapython/Makefile | 8 | ||||
| -rw-r--r-- | ipapython/py_default_encoding/Makefile | 8 | ||||
| -rw-r--r-- | ipapython/setup.py.in | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/ipapython/Makefile b/ipapython/Makefile index a09ffd1bb..d1a3ff54b 100644 --- a/ipapython/Makefile +++ b/ipapython/Makefile @@ -1,4 +1,4 @@ -PYTHONLIBDIR ?= $(shell python -c "from distutils.sysconfig import *; print get_python_lib()") +PYTHONLIBDIR ?= $(shell python2 -c "from distutils.sysconfig import *; print get_python_lib()") PACKAGEDIR ?= $(DESTDIR)/$(PYTHONLIBDIR)/ipa CONFIGDIR ?= $(DESTDIR)/etc/ipa TESTS = $(wildcard test/*.py) @@ -12,9 +12,9 @@ all: install: if [ "$(DESTDIR)" = "" ]; then \ - python setup.py install; \ + python2 setup.py install; \ else \ - python setup.py install --root $(DESTDIR); \ + python2 setup.py install --root $(DESTDIR); \ fi @for subdir in $(SUBDIRS); do \ (cd $$subdir && $(MAKE) $@) || exit 1; \ @@ -42,4 +42,4 @@ maintainer-clean: distclean test: $(subst .py,.tst,$(TESTS)) %.tst: %.py - python $< + python2 $< diff --git a/ipapython/py_default_encoding/Makefile b/ipapython/py_default_encoding/Makefile index 7cd1f6c58..88f17f705 100644 --- a/ipapython/py_default_encoding/Makefile +++ b/ipapython/py_default_encoding/Makefile @@ -1,15 +1,15 @@ -PYTHONLIBDIR ?= $(shell python -c "from distutils.sysconfig import *; print get_python_lib()") +PYTHONLIBDIR ?= $(shell python2 -c "from distutils.sysconfig import *; print get_python_lib()") PACKAGEDIR ?= $(DESTDIR)/$(PYTHONLIBDIR)/ipa CONFIGDIR ?= $(DESTDIR)/etc/ipa all: - python setup.py build + python2 setup.py build install: if [ "$(DESTDIR)" = "" ]; then \ - python setup.py install; \ + python2 setup.py install; \ else \ - python setup.py install --root $(DESTDIR); \ + python2 setup.py install --root $(DESTDIR); \ fi clean: diff --git a/ipapython/setup.py.in b/ipapython/setup.py.in index 108c95d0c..3acc8b8fe 100644 --- a/ipapython/setup.py.in +++ b/ipapython/setup.py.in @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python2 # Copyright (C) 2007 Red Hat # see file 'COPYING' for use and warranty information # |