| @@ -1,55 +1,55 @@ | | | @@ -1,55 +1,55 @@ |
1 | $NetBSD: patch-Makefile,v 1.7 2015/04/16 23:05:07 ryoon Exp $ | | 1 | $NetBSD: patch-Makefile,v 1.8 2015/08/09 17:43:41 ryoon Exp $ |
2 | | | 2 | |
3 | * Add "all" target. | | 3 | * Add "all" target. |
4 | * Use ${PREFIX} variable. | | 4 | * Use ${PREFIX} variable. |
5 | * Install man pages in ${PREFIX}/${PKGMANDIR}, not ${PREFIX}/share/man. | | 5 | * Install man pages in ${PREFIX}/${PKGMANDIR}, not ${PREFIX}/share/man. |
6 | | | 6 | |
7 | --- Makefile.orig 2015-04-02 12:54:25.000000000 +0000 | | 7 | --- Makefile.orig 2015-06-10 19:37:47.000000000 +0000 |
8 | +++ Makefile | | 8 | +++ Makefile |
9 | @@ -9,11 +9,12 @@ | | 9 | @@ -9,11 +9,12 @@ |
10 | VERSION=1.30 | | 10 | VERSION=1.32 |
11 | | | 11 | |
12 | .PATH: $(.PARSEDIR) | | 12 | .PATH: $(.PARSEDIR) |
13 | -prefix?=/usr/local | | 13 | -prefix?=/usr/local |
14 | +prefix?=$(PREFIX) | | 14 | +prefix?=$(PREFIX) |
15 | target=$(DESTDIR)$(prefix) | | 15 | target=$(DESTDIR)$(prefix) |
16 | parsedir:=$(.PARSEDIR) | | 16 | parsedir:=$(.PARSEDIR) |
17 | srcdir=$(dir $(abspath $(firstword $(MAKEFILE_LIST))))$(parsedir) | | 17 | srcdir=$(dir $(abspath $(firstword $(MAKEFILE_LIST))))$(parsedir) |
18 | VPATH=$(srcdir) | | 18 | VPATH=$(srcdir) |
19 | +mandir=$(PKGMANDIR) | | 19 | +mandir=$(PKGMANDIR) |
20 | | | 20 | |
21 | INSTALL = install | | 21 | INSTALL = install |
22 | | | 22 | |
23 | @@ -31,7 +32,7 @@ CFLAGS += -pthread | | 23 | @@ -31,7 +32,7 @@ CFLAGS += -pthread |
24 | CPPFLAGS += -DTHREADS | | 24 | CPPFLAGS += -DTHREADS |
25 | | | 25 | |
26 | # Optimizing for speed. Comment this out for distribution builds | | 26 | # Optimizing for speed. Comment this out for distribution builds |
27 | -CFLAGS += -march=native | | 27 | -CFLAGS += -march=native |
28 | +#CFLAGS += -march=native | | 28 | +#CFLAGS += -march=native |
29 | | | 29 | |
30 | # To enable debugging of the Yacc grammar, uncomment the following line | | 30 | # To enable debugging of the Yacc grammar, uncomment the following line |
31 | #CPPFLAGS += -DYYDEBUG=1 | | 31 | #CPPFLAGS += -DYYDEBUG=1 |
32 | @@ -89,6 +90,8 @@ dump.o export.o graph.o main.o merge.o r | | 32 | @@ -89,6 +90,8 @@ dump.o export.o graph.o main.o merge.o r |
33 | | | 33 | |
34 | BISON ?= bison | | 34 | BISON ?= bison |
35 | | | 35 | |
36 | +all: cvs-fast-export cvs-fast-export.1 | | 36 | +all: cvs-fast-export cvs-fast-export.1 |
37 | + | | 37 | + |
38 | gram.h gram.c: gram.y | | 38 | gram.h gram.c: gram.y |
39 | $(BISON) $(YFLAGS) --defines=gram.h --output-file=gram.c $(srcdir)/gram.y | | 39 | $(BISON) $(YFLAGS) --defines=gram.h --output-file=gram.c $(srcdir)/gram.y |
40 | lex.h lex.c: lex.l | | 40 | lex.h lex.c: lex.l |
41 | @@ -129,10 +132,10 @@ install-bin: cvs-fast-export cvssync cvs | | 41 | @@ -129,10 +132,10 @@ install-bin: cvs-fast-export cvssync cvs |
42 | $(INSTALL) -d "$(target)/bin" | | 42 | $(INSTALL) -d "$(target)/bin" |
43 | $(INSTALL) $^ "$(target)/bin" | | 43 | $(INSTALL) $^ "$(target)/bin" |
44 | install-man: man | | 44 | install-man: man |
45 | - $(INSTALL) -d "$(target)/share/man/man1" | | 45 | - $(INSTALL) -d "$(target)/share/man/man1" |
46 | - $(INSTALL) -m 644 cvs-fast-export.1 "$(target)/share/man/man1" | | 46 | - $(INSTALL) -m 644 cvs-fast-export.1 "$(target)/share/man/man1" |
47 | - $(INSTALL) -m 644 cvssync.1 "$(target)/share/man/man1" | | 47 | - $(INSTALL) -m 644 cvssync.1 "$(target)/share/man/man1" |
48 | - $(INSTALL) -m 644 cvsconvert.1 "$(target)/share/man/man1" | | 48 | - $(INSTALL) -m 644 cvsconvert.1 "$(target)/share/man/man1" |
49 | + $(INSTALL) -d "$(target)/${PKGMANDIR}/man1" | | 49 | + $(INSTALL) -d "$(target)/${PKGMANDIR}/man1" |
50 | + $(INSTALL) -m 644 cvs-fast-export.1 "$(target)/${PKGMANDIR}/man1" | | 50 | + $(INSTALL) -m 644 cvs-fast-export.1 "$(target)/${PKGMANDIR}/man1" |
51 | + $(INSTALL) -m 644 cvssync.1 "$(target)/${PKGMANDIR}/man1" | | 51 | + $(INSTALL) -m 644 cvssync.1 "$(target)/${PKGMANDIR}/man1" |
52 | + $(INSTALL) -m 644 cvsconvert.1 "$(target)/${PKGMANDIR}/man1" | | 52 | + $(INSTALL) -m 644 cvsconvert.1 "$(target)/${PKGMANDIR}/man1" |
53 | | | 53 | |
54 | PROFILE_REPO = ~/software/groff-conversion/groff-mirror/groff | | 54 | PROFILE_REPO = ~/software/groff-conversion/groff-mirror/groff |
55 | gmon.out: cvs-fast-export | | 55 | gmon.out: cvs-fast-export |