Merge lp:~salgado/pygettextpo/use-default-system-python into lp:pygettextpo

Proposed by Guilherme Salgado
Status: Merged
Merged at revision: 24
Proposed branch: lp:~salgado/pygettextpo/use-default-system-python
Merge into: lp:pygettextpo
Diff against target: 14 lines (+2/-3)
1 file modified
Makefile (+2/-3)
To merge this branch: bzr merge lp:~salgado/pygettextpo/use-default-system-python
Reviewer Review Type Date Requested Status
Gary Poster (community) Approve
Jelmer Vernooij (community) code* Approve
Launchpad PQM Bot Pending
Review via email: mp+24360@code.launchpad.net

Description of the change

Makefile now uses the default system python instead of what's defined by PYTHON_VERSION.

This makes it possible for us to build/run LP on either Hardy or Lucid with no changes and no need to have the python2.5 version of our dependencies installed.

To post a comment you must log in.
Revision history for this message
Jelmer Vernooij (jelmer) :
review: Approve (code*)
Revision history for this message
Gary Poster (gary) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile'
2--- Makefile 2009-10-31 11:56:57 +0000
3+++ Makefile 2010-04-28 19:43:26 +0000
4@@ -1,9 +1,8 @@
5 # Copyright Canonical Ltd. This software is licensed under the GNU
6 # Affero General Public License version 3 (see the file LICENSE).
7
8-PYTHON_VERSION = 2.4
9-PYTHON = python$(PYTHON_VERSION)
10-PYDOC = pydoc$(PYTHON_VERSION)
11+PYTHON = python
12+PYDOC = pydoc
13
14 all: gettextpo.so gettextpo.html
15

Subscribers

People subscribed via source and target branches