equal
deleted
inserted
replaced
1 This patch originated in-house but is not suitable for upstream. |
1 This patch originated in-house but is not suitable for upstream. |
2 |
2 |
3 --- meld-1.4.0/INSTALL.~1~ 2010-09-26 15:25:02.000000000 -0700 |
3 --- meld-1.8.6/INSTALL.orig 2015-03-13 11:10:19.822910199 -0700 |
4 +++ meld-1.4.0/INSTALL 2015-03-05 15:13:15.766057260 -0800 |
4 +++ meld-1.8.6/INSTALL 2015-03-13 11:10:40.322859285 -0700 |
5 @@ -17,8 +17,8 @@ |
5 @@ -33,8 +33,8 @@ |
6 ## Now run "/usr/local/bin/meld" |
6 ## Now run "/usr/local/bin/meld" |
7 ## |
7 ## |
8 ## You can customise the install paths used here: |
8 ## If you need to, you can customise the install paths used here: |
|
9 ## |
9 -PYTHON ?= python |
10 -PYTHON ?= python |
10 -prefix := /usr/local |
11 -prefix := /usr/local |
11 +PYTHON ?= python2.7 |
12 +PYTHON ?= python2.7 |
12 +prefix := /usr |
13 +prefix := /usr |
13 bindir := $(prefix)/bin |
14 bindir := $(prefix)/bin |