| author | Misaki Miyashita <Misaki.Miyashita@Oracle.COM> |
| Tue, 08 Dec 2015 14:36:41 -0800 | |
| changeset 5171 | 4e8b3c0ea78c |
| parent 3957 | a5f5c603e464 |
| permissions | -rw-r--r-- |
|
3914
0919f4d30271
20657358 migrate meld from Python 2.6 to 2.7
John Beck <John.Beck@Oracle.COM>
parents:
227
diff
changeset
|
1 |
This patch originated in-house but is not suitable for upstream. |
|
0919f4d30271
20657358 migrate meld from Python 2.6 to 2.7
John Beck <John.Beck@Oracle.COM>
parents:
227
diff
changeset
|
2 |
|
|
3957
a5f5c603e464
20704082 meld should be updated to version 1.8.6
Rich Burridge <rich.burridge@oracle.com>
parents:
3914
diff
changeset
|
3 |
--- meld-1.8.6/INSTALL.orig 2015-03-13 11:10:19.822910199 -0700 |
|
a5f5c603e464
20704082 meld should be updated to version 1.8.6
Rich Burridge <rich.burridge@oracle.com>
parents:
3914
diff
changeset
|
4 |
+++ meld-1.8.6/INSTALL 2015-03-13 11:10:40.322859285 -0700 |
|
a5f5c603e464
20704082 meld should be updated to version 1.8.6
Rich Burridge <rich.burridge@oracle.com>
parents:
3914
diff
changeset
|
5 |
@@ -33,8 +33,8 @@ |
|
227
1e1ccdc6b1e6
7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff
changeset
|
6 |
## |
|
3957
a5f5c603e464
20704082 meld should be updated to version 1.8.6
Rich Burridge <rich.burridge@oracle.com>
parents:
3914
diff
changeset
|
7 |
## If you need to, you can customise the install paths used here: |
|
a5f5c603e464
20704082 meld should be updated to version 1.8.6
Rich Burridge <rich.burridge@oracle.com>
parents:
3914
diff
changeset
|
8 |
## |
|
3914
0919f4d30271
20657358 migrate meld from Python 2.6 to 2.7
John Beck <John.Beck@Oracle.COM>
parents:
227
diff
changeset
|
9 |
-PYTHON ?= python |
|
227
1e1ccdc6b1e6
7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff
changeset
|
10 |
-prefix := /usr/local |
|
3914
0919f4d30271
20657358 migrate meld from Python 2.6 to 2.7
John Beck <John.Beck@Oracle.COM>
parents:
227
diff
changeset
|
11 |
+PYTHON ?= python2.7 |
|
227
1e1ccdc6b1e6
7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff
changeset
|
12 |
+prefix := /usr |
|
1e1ccdc6b1e6
7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff
changeset
|
13 |
bindir := $(prefix)/bin |
|
1e1ccdc6b1e6
7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff
changeset
|
14 |
libdir := $(prefix)/lib |
|
1e1ccdc6b1e6
7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff
changeset
|
15 |
docdir := $(prefix)/share/doc |