| @@ -1,46 +1,46 @@ | | | @@ -1,46 +1,46 @@ |
1 | $NetBSD: patch-aa,v 1.2 2009/07/07 22:24:37 joerg Exp $ | | 1 | $NetBSD: patch-aa,v 1.3 2009/10/29 22:00:58 tnn Exp $ |
2 | | | 2 | |
3 | --- Makefile.orig 2009-07-08 00:23:21.000000000 +0200 | | 3 | --- Makefile.orig 2009-10-29 22:59:43.000000000 +0100 |
4 | +++ Makefile | | 4 | +++ Makefile |
5 | @@ -1,29 +1,27 @@ | | 5 | @@ -1,29 +1,27 @@ |
6 | -AWFLIB = /usr/lib/awf # beware, awf itself knows this | | 6 | -AWFLIB = /usr/lib/awf # beware, awf itself knows this |
7 | -BIN = /usr/bin | | 7 | -BIN = /usr/bin |
8 | -MAN = /usr/man/man1 | | 8 | -MAN = /usr/man/man1 |
9 | +AWFLIB = ${PREFIX}/share/awf # beware, awf itself knows this | | 9 | +AWFLIB = ${PREFIX}/share/awf # beware, awf itself knows this |
10 | +BIN = ${PREFIX}/bin | | 10 | +BIN = ${PREFIX}/bin |
11 | +MAN = ${PREFIX}/man/man1 | | 11 | +MAN = ${PREFIX}/${PKGMANDIR}/man1 |
12 | CP = common dev.dumb mac.man mac.ms pass1 pass2.base pass2.man pass2.ms pass3 | | 12 | CP = common dev.dumb mac.man mac.ms pass1 pass2.base pass2.man pass2.ms pass3 |
13 | DTR = README COPYRIGHT Makefile awf awf.1 awf.1.out common dev.dumb mac.man \ | | 13 | DTR = README COPYRIGHT Makefile awf awf.1 awf.1.out common dev.dumb mac.man \ |
14 | mac.ms pass1 pass2.base pass2.man pass2.ms pass3 | | 14 | mac.ms pass1 pass2.base pass2.man pass2.ms pass3 |
15 | # System V brain damage | | 15 | # System V brain damage |
16 | -SHELL = /bin/sh | | 16 | -SHELL = /bin/sh |
17 | +#SHELL = /bin/sh | | 17 | +#SHELL = /bin/sh |
18 | | | 18 | |
19 | -r: awf.1 | | 19 | -r: awf.1 |
20 | +all r: awf.1 | | 20 | +all r: awf.1 |
21 | chmod +x awf | | 21 | chmod +x awf |
22 | - AWFLIB=. awf -man awf.1 >tmp | | 22 | - AWFLIB=. awf -man awf.1 >tmp |
23 | - cmp tmp awf.1.out | | 23 | - cmp tmp awf.1.out |
24 | - rm tmp | | 24 | - rm tmp |
25 | + AWFLIB=. ./awf -man awf.1 >tmp | | 25 | + AWFLIB=. ./awf -man awf.1 >tmp |
26 | | | 26 | |
27 | install: | | 27 | install: |
28 | - -if test ! -d $(AWFLIB) ; then mkdir $(AWFLIB) ; fi | | 28 | - -if test ! -d $(AWFLIB) ; then mkdir $(AWFLIB) ; fi |
29 | - cp $(CP) $(AWFLIB) | | 29 | - cp $(CP) $(AWFLIB) |
30 | - cp awf $(BIN) | | 30 | - cp awf $(BIN) |
31 | - cp awf.1 $(MAN) | | 31 | - cp awf.1 $(MAN) |
32 | + -if test ! -d ${DESTDIR}$(AWFLIB) ; then mkdir ${DESTDIR}$(AWFLIB) ; fi | | 32 | + -if test ! -d ${DESTDIR}$(AWFLIB) ; then mkdir ${DESTDIR}$(AWFLIB) ; fi |
33 | + cp $(CP) ${DESTDIR}$(AWFLIB) | | 33 | + cp $(CP) ${DESTDIR}$(AWFLIB) |
34 | + cp awf ${DESTDIR}$(BIN) | | 34 | + cp awf ${DESTDIR}$(BIN) |
35 | + cp awf.1 ${DESTDIR}$(MAN) | | 35 | + cp awf.1 ${DESTDIR}$(MAN) |
36 | | | 36 | |
37 | rr: r testm tests.Z tests.out.Z | | 37 | rr: r testm tests.Z tests.out.Z |
38 | - AWFLIB=. awf -man testm >tmp | | 38 | - AWFLIB=. awf -man testm >tmp |
39 | + AWFLIB=. ./awf -man testm >tmp | | 39 | + AWFLIB=. ./awf -man testm >tmp |
40 | cmp tmp testm.out | | 40 | cmp tmp testm.out |
41 | rm tmp | | 41 | rm tmp |
42 | - uncompress <tests.Z | AWFLIB=. awf -ms >tmp | | 42 | - uncompress <tests.Z | AWFLIB=. awf -ms >tmp |
43 | + uncompress <tests.Z | AWFLIB=. ./awf -ms >tmp | | 43 | + uncompress <tests.Z | AWFLIB=. ./awf -ms >tmp |
44 | uncompress <tests.out.Z | cmp - tmp | | 44 | uncompress <tests.out.Z | cmp - tmp |
45 | rm tmp | | 45 | rm tmp |
46 | | | 46 | |