author | John Beck <John.Beck@Oracle.COM> |
Thu, 05 Mar 2015 15:29:46 -0800 | |
branch | s11-update |
changeset 4237 | 3517b6c3873e |
parent 227 | 1e1ccdc6b1e6 |
child 3957 | a5f5c603e464 |
child 7869 | a80ad5071d35 |
permissions | -rw-r--r-- |
4237
3517b6c3873e
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. |
3517b6c3873e
20657358 migrate meld from Python 2.6 to 2.7
John Beck <John.Beck@Oracle.COM>
parents:
227
diff
changeset
|
2 |
|
3517b6c3873e
20657358 migrate meld from Python 2.6 to 2.7
John Beck <John.Beck@Oracle.COM>
parents:
227
diff
changeset
|
3 |
--- meld-1.4.0/INSTALL.~1~ 2010-09-26 15:25:02.000000000 -0700 |
3517b6c3873e
20657358 migrate meld from Python 2.6 to 2.7
John Beck <John.Beck@Oracle.COM>
parents:
227
diff
changeset
|
4 |
+++ meld-1.4.0/INSTALL 2015-03-05 15:13:15.766057260 -0800 |
3517b6c3873e
20657358 migrate meld from Python 2.6 to 2.7
John Beck <John.Beck@Oracle.COM>
parents:
227
diff
changeset
|
5 |
@@ -17,8 +17,8 @@ |
3517b6c3873e
20657358 migrate meld from Python 2.6 to 2.7
John Beck <John.Beck@Oracle.COM>
parents:
227
diff
changeset
|
6 |
## Now run "/usr/local/bin/meld" |
227
1e1ccdc6b1e6
7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff
changeset
|
7 |
## |
1e1ccdc6b1e6
7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff
changeset
|
8 |
## You can customise the install paths used here: |
4237
3517b6c3873e
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 |
4237
3517b6c3873e
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 |