| @@ -1,14 +1,14 @@ | | | @@ -1,14 +1,14 @@ |
1 | $NetBSD: patch-aa,v 1.9 2014/01/15 16:23:31 drochner Exp $ | | 1 | $NetBSD: patch-aa,v 1.10 2016/04/01 22:29:36 jperkin Exp $ |
2 | | | 2 | |
3 | --- Makefile.orig 2013-09-01 23:02:02.000000000 +0000 | | 3 | --- Makefile.orig 2013-09-01 23:02:02.000000000 +0000 |
4 | +++ Makefile | | 4 | +++ Makefile |
5 | @@ -585,7 +585,7 @@ HAVE_UNUSED= | | 5 | @@ -585,7 +585,7 @@ HAVE_UNUSED= |
6 | | | 6 | |
7 | #INCDIR= /usr/local/include | | 7 | #INCDIR= /usr/local/include |
8 | #INCDIR= /dev/env/DJDIR/include | | 8 | #INCDIR= /dev/env/DJDIR/include |
9 | -INCDIR= /usr/include | | 9 | -INCDIR= /usr/include |
10 | +INCDIR= ${PREFIX}/include | | 10 | +INCDIR= ${PREFIX}/include |
11 | | | 11 | |
12 | # Where to install calc related things | | 12 | # Where to install calc related things |
13 | # | | 13 | # |
14 | @@ -624,15 +624,15 @@ INCDIR= /usr/include | | 14 | @@ -624,15 +624,15 @@ INCDIR= /usr/include |
| @@ -25,27 +25,27 @@ $NetBSD: patch-aa,v 1.9 2014/01/15 16:23 | | | @@ -25,27 +25,27 @@ $NetBSD: patch-aa,v 1.9 2014/01/15 16:23 |
25 | | | 25 | |
26 | #CALC_SHAREDIR= /usr/local/lib/calc | | 26 | #CALC_SHAREDIR= /usr/local/lib/calc |
27 | #CALC_SHAREDIR= /dev/env/DJDIR/share/calc | | 27 | #CALC_SHAREDIR= /dev/env/DJDIR/share/calc |
28 | -CALC_SHAREDIR= /usr/share/calc | | 28 | -CALC_SHAREDIR= /usr/share/calc |
29 | +CALC_SHAREDIR= ${PREFIX}/share/calc | | 29 | +CALC_SHAREDIR= ${PREFIX}/share/calc |
30 | | | 30 | |
31 | # NOTE: Do not set CALC_INCDIR to /usr/include or /usr/local/include!!! | | 31 | # NOTE: Do not set CALC_INCDIR to /usr/include or /usr/local/include!!! |
32 | # Always be sure that the CALC_INCDIR path ends in /calc to avoid | | 32 | # Always be sure that the CALC_INCDIR path ends in /calc to avoid |
33 | @@ -710,7 +710,7 @@ T= | | 33 | @@ -710,7 +710,7 @@ T= |
34 | #MANDIR= | | 34 | #MANDIR= |
35 | #MANDIR= /usr/local/man/man1 | | 35 | #MANDIR= /usr/local/man/man1 |
36 | #MANDIR= /usr/man/man1 | | 36 | #MANDIR= /usr/man/man1 |
37 | -MANDIR= /usr/share/man/man1 | | 37 | -MANDIR= /usr/share/man/man1 |
38 | +MANDIR= ${PREFIX}/man/man1 | | 38 | +MANDIR= ${PREFIX}/${PKGMANDIR}/man1 |
39 | #MANDIR= /dev/env/DJDIR/man/man1 | | 39 | #MANDIR= /dev/env/DJDIR/man/man1 |
40 | #MANDIR= /usr/man/u_man/man1 | | 40 | #MANDIR= /usr/man/u_man/man1 |
41 | #MANDIR= /usr/contrib/man/man1 | | 41 | #MANDIR= /usr/contrib/man/man1 |
42 | @@ -721,7 +721,7 @@ MANDIR= /usr/share/man/man1 | | 42 | @@ -721,7 +721,7 @@ MANDIR= /usr/share/man/man1 |
43 | # | | 43 | # |
44 | # Use CATDIR= to disable installation of the calc cat (formatted) page. | | 44 | # Use CATDIR= to disable installation of the calc cat (formatted) page. |
45 | # | | 45 | # |
46 | -CATDIR= | | 46 | -CATDIR= |
47 | +CATDIR= ${PREFIX}/man/cat1 | | 47 | +CATDIR= ${PREFIX}/man/cat1 |
48 | #CATDIR= /usr/local/man/cat1 | | 48 | #CATDIR= /usr/local/man/cat1 |
49 | #CATDIR= /usr/local/catman/cat1 | | 49 | #CATDIR= /usr/local/catman/cat1 |
50 | #CATDIR= /usr/man/cat1 | | 50 | #CATDIR= /usr/man/cat1 |
51 | @@ -742,9 +742,9 @@ MANEXT= 1 | | 51 | @@ -742,9 +742,9 @@ MANEXT= 1 |