| author | Norm Jacobs <Norm.Jacobs@Oracle.COM> |
| Thu, 12 Jan 2017 14:51:27 -0800 | |
| changeset 7571 | 9e9a7ce5d204 |
| parent 5583 | 26ddfc624753 |
| permissions | -rw-r--r-- |
|
3605
0b7c9f67df31
20147365 Migrate tree (back) to userland from desktop
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
1 |
# Patch origin internal. |
|
0b7c9f67df31
20147365 Migrate tree (back) to userland from desktop
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
2 |
# Not to be sent upstream, because changes to this native Makefile were intended |
|
0b7c9f67df31
20147365 Migrate tree (back) to userland from desktop
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
3 |
# to be part of the build process. |
|
0b7c9f67df31
20147365 Migrate tree (back) to userland from desktop
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
4 |
# |
|
0b7c9f67df31
20147365 Migrate tree (back) to userland from desktop
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
5 |
# Of the suggested Solaris lines, only XOBJS (specific to this compoent) should |
|
0b7c9f67df31
20147365 Migrate tree (back) to userland from desktop
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
6 |
# be set here. |
|
0b7c9f67df31
20147365 Migrate tree (back) to userland from desktop
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
7 |
# The rest (CC, CFLAGS, LDFLAGS, MANDIR) need to be set by the Userland build |
|
0b7c9f67df31
20147365 Migrate tree (back) to userland from desktop
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
8 |
# environment to get the correct values. |
|
0b7c9f67df31
20147365 Migrate tree (back) to userland from desktop
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
9 |
|
|
5583
26ddfc624753
22862722 Update tree to version 1.7.0
Rich Burridge <rich.burridge@oracle.com>
parents:
3605
diff
changeset
|
10 |
--- tree-1.7.0/Makefile.orig 2016-03-02 16:39:19.874601327 -0800 |
|
26ddfc624753
22862722 Update tree to version 1.7.0
Rich Burridge <rich.burridge@oracle.com>
parents:
3605
diff
changeset
|
11 |
+++ tree-1.7.0/Makefile 2016-03-02 16:36:53.954602502 -0800 |
|
26ddfc624753
22862722 Update tree to version 1.7.0
Rich Burridge <rich.burridge@oracle.com>
parents:
3605
diff
changeset
|
12 |
@@ -43,7 +43,7 @@ |
|
3605
0b7c9f67df31
20147365 Migrate tree (back) to userland from desktop
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
13 |
#CC=cc |
|
0b7c9f67df31
20147365 Migrate tree (back) to userland from desktop
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
14 |
#CFLAGS=-xO0 -v |
|
0b7c9f67df31
20147365 Migrate tree (back) to userland from desktop
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
15 |
#LDFLAGS= |
|
5583
26ddfc624753
22862722 Update tree to version 1.7.0
Rich Burridge <rich.burridge@oracle.com>
parents:
3605
diff
changeset
|
16 |
-#OBJS+=strverscmp.o |
|
26ddfc624753
22862722 Update tree to version 1.7.0
Rich Burridge <rich.burridge@oracle.com>
parents:
3605
diff
changeset
|
17 |
+OBJS+=strverscmp.o |
|
3605
0b7c9f67df31
20147365 Migrate tree (back) to userland from desktop
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
18 |
#MANDIR=${prefix}/share/man/man1
|
|
0b7c9f67df31
20147365 Migrate tree (back) to userland from desktop
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
19 |
|
|
0b7c9f67df31
20147365 Migrate tree (back) to userland from desktop
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
20 |
# Uncomment for Cygwin: |