| @@ -1,28 +1,29 @@ | | | @@ -1,28 +1,29 @@ |
1 | $NetBSD: patch-aa,v 1.4 2012/07/03 17:39:53 joerg Exp $ | | 1 | $NetBSD: patch-aa,v 1.5 2016/04/01 10:27:54 jperkin Exp $ |
2 | | | 2 | |
3 | --- Makefile.orig 1994-12-15 01:53:00.000000000 +0000 | | 3 | --- Makefile.orig 1994-12-15 01:53:00.000000000 +0000 |
4 | +++ Makefile | | 4 | +++ Makefile |
5 | @@ -46,16 +46,16 @@ DATA = $(PROGRAM).data | | 5 | @@ -46,16 +46,16 @@ DATA = $(PROGRAM).data |
6 | NINSTPKG = $(PROGRAM).pkg | | 6 | NINSTPKG = $(PROGRAM).pkg |
7 | | | 7 | |
8 | # where to install this stuff | | 8 | # where to install this stuff |
9 | -DEST = /usr | | 9 | -DEST = /usr |
10 | +DEST = ${DESTDIR}$(PREFIX) | | 10 | +DEST = ${DESTDIR}$(PREFIX) |
11 | #DEST = $(HOME)/local | | 11 | #DEST = $(HOME)/local |
12 | DESTBIN = $(DEST)/bin | | 12 | DESTBIN = $(DEST)/bin |
13 | -DESTLIB = $(DEST)/lib | | 13 | -DESTLIB = $(DEST)/lib |
| | | 14 | -DESTMAN = $(DEST)/man |
14 | +DESTLIB = $(DEST)/libdata/brs | | 15 | +DESTLIB = $(DEST)/libdata/brs |
15 | DESTMAN = $(DEST)/man | | 16 | +DESTMAN = $(DEST)/${PKGMANDIR} |
16 | DESTMAN1 = $(DESTMAN)/man1 | | 17 | DESTMAN1 = $(DESTMAN)/man1 |
17 | | | 18 | |
18 | # I use environment variables for these... | | 19 | # I use environment variables for these... |
19 | #CFLAGS = -g | | 20 | #CFLAGS = -g |
20 | -CFLAGS = -O2 -fwritable-strings -DDESTLIB=\"$(DESTLIB)\" | | 21 | -CFLAGS = -O2 -fwritable-strings -DDESTLIB=\"$(DESTLIB)\" |
21 | +CFLAGS += -fwritable-strings -DDESTLIB=\"$(DESTLIB)\" | | 22 | +CFLAGS += -fwritable-strings -DDESTLIB=\"$(DESTLIB)\" |
22 | | | 23 | |
23 | # release directories. Nobody should care about this but me | | 24 | # release directories. Nobody should care about this but me |
24 | FTPHOME = /mnt/ftp | | 25 | FTPHOME = /mnt/ftp |
25 | @@ -66,7 +66,7 @@ NINSTPKGDIR = $(NINSTDIR)/packages | | 26 | @@ -66,7 +66,7 @@ NINSTPKGDIR = $(NINSTDIR)/packages |
26 | # This is only used by the author when making a new release ftp-able. | | 27 | # This is only used by the author when making a new release ftp-able. |
27 | INSTALL = .do cp | | 28 | INSTALL = .do cp |
28 | | | 29 | |