author | Michael Nestler <Michael.Nestler@Oracle.COM> |
Mon, 01 Dec 2014 16:23:23 -0800 | |
changeset 3605 | 0b7c9f67df31 |
child 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 |
|
0b7c9f67df31
20147365 Migrate tree (back) to userland from desktop
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
10 |
--- tree-1.5.3/Makefile Mon Oct 19 11:56:28 2009 |
0b7c9f67df31
20147365 Migrate tree (back) to userland from desktop
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
11 |
+++ tree-1.5.3/Makefile.new Mon Dec 1 12:35:08 2014 |
0b7c9f67df31
20147365 Migrate tree (back) to userland from desktop
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
12 |
@@ -32,7 +32,7 @@ |
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= |
0b7c9f67df31
20147365 Migrate tree (back) to userland from desktop
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
16 |
-#XOBJS=strverscmp.o |
0b7c9f67df31
20147365 Migrate tree (back) to userland from desktop
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
17 |
+XOBJS=strverscmp.o |
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: |