Lines 1-52
Link Here
|
1 |
--- Makefile.orig 2018-01-18 21:02:20.000000000 +0100 |
1 |
--- Makefile.orig 2022-01-23 13:10:10.027280000 +0100 |
2 |
+++ Makefile 2019-03-20 11:22:05.133686000 +0100 |
2 |
+++ Makefile 2022-01-23 13:14:05.143686000 +0100 |
3 |
@@ -16,28 +16,28 @@ |
3 |
@@ -24,7 +24,7 @@ |
4 |
# along with this program; if not, write to the Free Software |
4 |
VERSION=2.0.1 |
5 |
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
|
|
6 |
|
7 |
-prefix = /usr |
8 |
+prefix = ${PREFIX} |
9 |
|
10 |
-CC=gcc |
11 |
+CC?=cc |
12 |
|
13 |
VERSION=1.8.0 |
14 |
TREE_DEST=tree |
5 |
TREE_DEST=tree |
15 |
BINDIR=${prefix}/bin |
6 |
DESTDIR=${PREFIX}/bin |
16 |
-MAN=tree.1 |
7 |
-MAN=tree.1 |
17 |
+MAN=doc/tree.1 |
8 |
+MAN=doc/tree.1 |
18 |
MANDIR=${prefix}/man/man1 |
9 |
MANDIR=${PREFIX}/man |
19 |
OBJS=tree.o unix.o html.o xml.o json.o hash.o color.o file.o |
10 |
OBJS=tree.o list.o hash.o color.o file.o filter.o info.o unix.o xml.o json.o html.o strverscmp.o |
20 |
|
11 |
|
21 |
# Uncomment options below for your particular OS: |
12 |
@@ -32,13 +32,13 @@ |
22 |
|
13 |
|
23 |
# Linux defaults: |
14 |
# Linux defaults: |
24 |
-CFLAGS=-ggdb -pedantic -Wall -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 |
15 |
#CFLAGS=-ggdb -pedantic -Wall -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 |
25 |
+#CFLAGS=-ggdb -pedantic -Wall -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 |
16 |
-CFLAGS=-O3 -pedantic -Wall -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 |
26 |
#CFLAGS=-O4 -Wall -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 |
17 |
-LDFLAGS=-s |
27 |
#LDFLAGS=-s |
18 |
+#CFLAGS=-O3 -pedantic -Wall -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 |
|
|
19 |
+#LDFLAGS=-s |
28 |
|
20 |
|
29 |
# Uncomment for FreeBSD: |
21 |
# Uncomment for FreeBSD: |
|
|
22 |
-#CC=cc |
30 |
-#CFLAGS=-O2 -Wall -fomit-frame-pointer |
23 |
-#CFLAGS=-O2 -Wall -fomit-frame-pointer |
31 |
-#LDFLAGS=-s |
24 |
-#LDFLAGS=-s |
32 |
-#OBJS+=strverscmp.o |
25 |
+CC=cc |
33 |
+CFLAGS=-O2 -Wall -fomit-frame-pointer |
26 |
+CFLAGS=-O2 -Wall -fomit-frame-pointer |
34 |
+LDFLAGS=-s |
27 |
+LDFLAGS=-s |
35 |
+OBJS+=strverscmp.o |
|
|
36 |
|
28 |
|
37 |
# Uncomment for OpenBSD: |
29 |
# Uncomment for OpenBSD: |
38 |
#TREE_DEST=colortree |
30 |
#TREE_DEST=colortree |
39 |
@@ -108,13 +108,11 @@ |
31 |
@@ -101,11 +101,11 @@ |
40 |
if [ -f tree.o ]; then rm *.o; fi |
32 |
clean: |
41 |
rm -f *~ |
33 |
rm -f $(TREE_DEST) *.o *~ |
42 |
|
34 |
|
43 |
-install: tree |
35 |
-install: tree |
44 |
- install -d $(BINDIR) |
36 |
- $(INSTALL) -d $(DESTDIR) |
45 |
- install -d $(MANDIR) |
37 |
- $(INSTALL) -d $(MANDIR)/man1 |
46 |
- if [ -e $(TREE_DEST) ]; then \ |
38 |
- $(INSTALL) $(TREE_DEST) $(DESTDIR)/$(TREE_DEST); \ |
47 |
- install $(TREE_DEST) $(BINDIR)/$(TREE_DEST); \ |
39 |
- $(INSTALL) -m 644 doc/$(MAN) $(MANDIR)/man1/$(MAN) |
48 |
- fi |
|
|
49 |
- install doc/$(MAN) $(MANDIR)/$(MAN) |
50 |
+install: $(TREE_DEST) |
40 |
+install: $(TREE_DEST) |
51 |
+ @$(MKDIR) $(BINDIR) |
41 |
+ @$(MKDIR) $(BINDIR) |
52 |
+ @$(MKDIR) $(MANDIR) |
42 |
+ @$(MKDIR) $(MANDIR) |
Lines 54-57
Link Here
|
54 |
+ ${BSD_INSTALL_MAN} $(MAN) $(MANDIR) |
44 |
+ ${BSD_INSTALL_MAN} $(MAN) $(MANDIR) |
55 |
|
45 |
|
56 |
distclean: |
46 |
distclean: |
57 |
if [ -f tree.o ]; then rm *.o; fi |
47 |
rm -f *.o *~ |
58 |
- |
|
|