Lines 1-5
Link Here
|
1 |
--- Makefile.orig 2014-05-04 20:11:04.000000000 -0700 |
1 |
--- Makefile.orig 2018-01-18 21:02:20.000000000 +0100 |
2 |
+++ Makefile 2014-05-04 20:13:48.000000000 -0700 |
2 |
+++ Makefile 2019-03-20 11:22:05.133686000 +0100 |
3 |
@@ -16,28 +16,28 @@ |
3 |
@@ -16,28 +16,28 @@ |
4 |
# along with this program; if not, write to the Free Software |
4 |
# along with this program; if not, write to the Free Software |
5 |
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
5 |
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
Lines 8-28
Link Here
|
8 |
+prefix = ${PREFIX} |
8 |
+prefix = ${PREFIX} |
9 |
|
9 |
|
10 |
-CC=gcc |
10 |
-CC=gcc |
11 |
+CC?=gcc |
11 |
+CC=cc |
12 |
|
12 |
|
13 |
VERSION=1.7.0 |
13 |
VERSION=1.8.0 |
14 |
TREE_DEST=tree |
14 |
TREE_DEST=tree |
15 |
BINDIR=${prefix}/bin |
15 |
BINDIR=${prefix}/bin |
16 |
-MAN=tree.1 |
16 |
-MAN=tree.1 |
17 |
+MAN=doc/tree.1 |
17 |
+MAN=doc/tree.1 |
18 |
MANDIR=${prefix}/man/man1 |
18 |
MANDIR=${prefix}/man/man1 |
19 |
OBJS=tree.o unix.o html.o xml.o json.o hash.o color.o |
19 |
OBJS=tree.o unix.o html.o xml.o json.o hash.o color.o file.o |
20 |
|
20 |
|
21 |
# Uncomment options below for your particular OS: |
21 |
# Uncomment options below for your particular OS: |
22 |
|
22 |
|
23 |
# Linux defaults: |
23 |
# Linux defaults: |
24 |
-CFLAGS=-ggdb -Wall -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 |
24 |
-CFLAGS=-ggdb -pedantic -Wall -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 |
25 |
+#CFLAGS=-ggdb -Wall -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 |
25 |
+#CFLAGS=-ggdb -pedantic -Wall -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 |
26 |
#CFLAGS=-O4 -Wall -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 |
26 |
#CFLAGS=-O4 -Wall -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 |
27 |
#LDFLAGS=-s |
27 |
#LDFLAGS=-s |
28 |
|
28 |
|
Lines 30-42
Link Here
|
30 |
-#CFLAGS=-O2 -Wall -fomit-frame-pointer |
30 |
-#CFLAGS=-O2 -Wall -fomit-frame-pointer |
31 |
-#LDFLAGS=-s |
31 |
-#LDFLAGS=-s |
32 |
-#OBJS+=strverscmp.o |
32 |
-#OBJS+=strverscmp.o |
33 |
+CFLAGS?=-O2 -Wall -fomit-frame-pointer |
33 |
+CFLAGS=-O2 -Wall -fomit-frame-pointer |
34 |
+LDFLAGS?=-s |
34 |
+LDFLAGS=-s |
35 |
+OBJS+=strverscmp.o |
35 |
+OBJS+=strverscmp.o |
36 |
|
36 |
|
37 |
# Uncomment for Solaris: |
37 |
# Uncomment for OpenBSD: |
38 |
#CC=cc |
38 |
#TREE_DEST=colortree |
39 |
@@ -94,13 +94,11 @@ |
39 |
@@ -108,13 +108,11 @@ |
40 |
if [ -f tree.o ]; then rm *.o; fi |
40 |
if [ -f tree.o ]; then rm *.o; fi |
41 |
rm -f *~ |
41 |
rm -f *~ |
42 |
|
42 |
|