~launchpad-pqm/launchpad/devel

Committer: Guilherme Salgado
Date: 2010-04-28 18:25:11 UTC
mto: This revision was merged to the branch mainline in revision 10969.
Revision ID: salgado@canonical.com-20100428182511-3m56yrajzkwts7jl

Get rid of PYTHON_VERSION from all Makefiles and use a customized pygettextpo which uses the default system python instead of what's defined in PYTHON_VERSION

files modified:
Makefile

lib/canonical/librarian/Makefile

sourcecode/Makefile

utilities/sourcedeps.conf

Show diffs side-by-side

added added

removed removed

sourcecode/Makefile

# XXX: Nasty hack to make sure the default python is used when

# building/running. Specially useful for source deps like pygettextpo.

PYTHON_VERSION:=$(shell python -c 'import sys; print ".".join(["%d" % n for n in sys.version_info[:2]])')

PYTHON=python${PYTHON_VERSION}

PYTHON=python

# Not all packages have a working Makefile. Work around this by hardcoding

# the ones we test. If we fix them all to have EITHER a good makefile

# (build and check targets work), or no makefile we can reenable auto

build_dirs:=cscvs dulwich pygettextpo pygpgme subvertpy

test_dirs:=cscvs pygettextpo

TEST_ENV_VARS = \

PYTHON=$(PYTHON) \

PYTHON_VERSION=$(PYTHON_VERSION)

TEST_ENV_VARS = PYTHON=$(PYTHON)

all:

Older »