| author | Petr Sumbera <petr.sumbera@oracle.com> |
| Tue, 01 Apr 2014 01:43:14 -0700 | |
| branch | s11u1-sru |
| changeset 3035 | 8420a12f63ef |
| parent 227 | 1e1ccdc6b1e6 |
| child 3914 | 0919f4d30271 |
| permissions | -rw-r--r-- |
|
227
1e1ccdc6b1e6
7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff
changeset
|
1 |
--- meld-1.4.0/INSTALL Sun Sep 26 15:25:02 2010 |
|
1e1ccdc6b1e6
7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff
changeset
|
2 |
+++ meld-1.4.0/new.INSTALL Mon Apr 25 11:11:12 2011 |
|
1e1ccdc6b1e6
7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff
changeset
|
3 |
@@ -18,7 +18,7 @@ |
|
1e1ccdc6b1e6
7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff
changeset
|
4 |
## |
|
1e1ccdc6b1e6
7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff
changeset
|
5 |
## You can customise the install paths used here: |
|
1e1ccdc6b1e6
7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff
changeset
|
6 |
PYTHON ?= python |
|
1e1ccdc6b1e6
7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff
changeset
|
7 |
-prefix := /usr/local |
|
1e1ccdc6b1e6
7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff
changeset
|
8 |
+prefix := /usr |
|
1e1ccdc6b1e6
7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff
changeset
|
9 |
bindir := $(prefix)/bin |
|
1e1ccdc6b1e6
7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff
changeset
|
10 |
libdir := $(prefix)/lib |
|
1e1ccdc6b1e6
7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff
changeset
|
11 |
docdir := $(prefix)/share/doc |