equal
deleted
inserted
replaced
1 --- meld-1.4.0/INSTALL Sun Sep 26 15:25:02 2010 |
1 This patch originated in-house but is not suitable for upstream. |
2 +++ meld-1.4.0/new.INSTALL Mon Apr 25 11:11:12 2011 |
2 |
3 @@ -18,7 +18,7 @@ |
3 --- meld-1.4.0/INSTALL.~1~ 2010-09-26 15:25:02.000000000 -0700 |
|
4 +++ meld-1.4.0/INSTALL 2015-03-05 15:13:15.766057260 -0800 |
|
5 @@ -17,8 +17,8 @@ |
|
6 ## Now run "/usr/local/bin/meld" |
4 ## |
7 ## |
5 ## You can customise the install paths used here: |
8 ## You can customise the install paths used here: |
6 PYTHON ?= python |
9 -PYTHON ?= python |
7 -prefix := /usr/local |
10 -prefix := /usr/local |
|
11 +PYTHON ?= python2.7 |
8 +prefix := /usr |
12 +prefix := /usr |
9 bindir := $(prefix)/bin |
13 bindir := $(prefix)/bin |
10 libdir := $(prefix)/lib |
14 libdir := $(prefix)/lib |
11 docdir := $(prefix)/share/doc |
15 docdir := $(prefix)/share/doc |