commit 19: 5b612ed635ce
parent 18: a61c4a4198a0
branch: default
Makefile compatibility for python 2.6
Michael Tharp
14 months ago

Changed (Δ141 bytes):

raw changeset »

Make.defs (2 lines added, 1 lines removed)

Make.rules (1 lines added, 1 lines removed)

Up to file-list Make.defs:

@@ -16,9 +16,10 @@ VERSION=1.0
16
16
# VERSION can be overridden by snapshot builds to force incompatible versions
17
17
18
18
export prefix = /usr
19
export lib = $(shell arch | sed -r '/x86_64|ppc64|s390x|sparc64/{s/.*/lib64/;q};s/.*/lib/')
19
20
export bindir = $(prefix)/bin
20
21
export sbindir = $(prefix)/sbin
21
export libdir = $(prefix)/lib
22
export libdir = $(prefix)/$(lib)
22
23
export libexecdir = $(prefix)/libexec
23
24
export datadir = $(prefix)/share
24
25
export mandir = $(datadir)/man

Up to file-list Make.rules:

12
12
# full details.
13
13
#
14
14
15
PYTHON = $(shell [ -x /usr/bin/python2.4 ] && echo /usr/bin/python2.4)
15
PYTHON = /usr/bin/python
16
16
PYVERSION = $(shell $(PYTHON) -c 'import os, sys; print sys.version[:3]')
17
17
PYINCLUDE = $(shell $(PYTHON) -c 'import os, sys; print os.sep.join((sys.prefix, "include", "python" + sys.version[:3]))')
18
18