From 5e96fbc22afa02f08f71513e7b59d3d5c6a1f9dc Mon Sep 17 00:00:00 2001 From: Xiao-Long Chen Date: Wed, 27 Nov 2013 14:53:57 +0100 Subject: 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 --- ipapython/Makefile | 8 ++++---- ipapython/py_default_encoding/Makefile | 8 ++++---- ipapython/setup.py.in | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) (limited to 'ipapython') diff --git a/ipapython/Makefile b/ipapython/Makefile index a09ffd1b..d1a3ff54 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 7cd1f6c5..88f17f70 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 108c95d0..3acc8b8f 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 # -- cgit