| @@ -1,43 +1,46 @@ | | | @@ -1,43 +1,46 @@ |
| 1 | $NetBSD: patch-aa,v 1.4 2009/07/08 15:14:45 joerg Exp $ | | 1 | $NetBSD: patch-aa,v 1.5 2009/09/23 13:34:33 tnn Exp $ |
| 2 | | | 2 | |
| 3 | --- Makefile.orig 2001-05-17 21:27:07.000000000 +0200 | | 3 | --- Makefile.orig 2001-05-17 21:27:07.000000000 +0200 |
| 4 | +++ Makefile | | 4 | +++ Makefile |
| 5 | @@ -5,20 +5,20 @@ | | 5 | @@ -5,30 +5,30 @@ |
| 6 | ###################################################################### | | 6 | ###################################################################### |
| 7 | # Change the following to suit your needs | | 7 | # Change the following to suit your needs |
| 8 | | | 8 | |
| 9 | -SHELL=/bin/bash | | 9 | -SHELL=/bin/bash |
| 10 | +SHELL=${SH} | | 10 | +SHELL=${SH} |
| 11 | | | 11 | |
| 12 | # The directory root of your installation | | 12 | # The directory root of your installation |
| 13 | # If you make a personal installation, change it to your home directory | | 13 | # If you make a personal installation, change it to your home directory |
| 14 | # Default: /usr | | 14 | # Default: /usr |
| 15 | # uncomment the following line to install to the default directories... | | 15 | # uncomment the following line to install to the default directories... |
| 16 | -TREE=/usr | | 16 | -TREE=/usr |
| 17 | +TREE=${PREFIX} | | 17 | +TREE=${PREFIX} |
| 18 | # ...or the following line to install into your home directory: | | 18 | # ...or the following line to install into your home directory: |
| 19 | # TREE=$(HOME) | | 19 | # TREE=$(HOME) |
| 20 | | | 20 | |
| 21 | # if you don't have the gd graphic library installed, you have to comment out or | | 21 | # if you don't have the gd graphic library installed, you have to comment out or |
| 22 | # delete the following line. However, gp_map is such a nice program, so you | | 22 | # delete the following line. However, gp_map is such a nice program, so you |
| 23 | # better go to www.boutell.com and download the gd library. | | 23 | # better go to www.boutell.com and download the gd library. |
| 24 | -GDPROGRAMS=gp_map | | 24 | -GDPROGRAMS=gp_map |
| 25 | +# GDPROGRAMS=gp_map | | 25 | +# GDPROGRAMS=gp_map |
| 26 | | | 26 | |
| 27 | # Directory to install the programs themselves. | | 27 | # Directory to install the programs themselves. |
| 28 | # Default: /usr/local/bin | | 28 | # Default: /usr/local/bin |
| 29 | @@ -28,7 +28,7 @@ BINDIR=$(TREE)/bin | | 29 | BINDIR=$(TREE)/bin |
| 30 | MANDIR=$(TREE)/man | | 30 | |
| | | 31 | # directory to install the manual pages |
| | | 32 | -MANDIR=$(TREE)/man |
| | | 33 | +MANDIR=$(TREE)/$(PKGMANDIR) |
| 31 | | | 34 | |
| 32 | #directory to install the data directory | | 35 | #directory to install the data directory |
| 33 | -DATADIR=$(TREE)/lib | | 36 | -DATADIR=$(TREE)/lib |
| 34 | +DATADIR=$(TREE)/share/examples | | 37 | +DATADIR=$(TREE)/share/examples |
| 35 | | | 38 | |
| 36 | # documentation. | | 39 | # documentation. |
| 37 | # If you want to install documents automagically, type: | | 40 | # If you want to install documents automagically, type: |
| 38 | @@ -67,18 +67,18 @@ clean: | | 41 | @@ -67,18 +67,18 @@ clean: |
| 39 | -cd src/ ; rm $(PROGRAMS) core | | 42 | -cd src/ ; rm $(PROGRAMS) core |
| 40 | | | 43 | |
| 41 | install: all | | 44 | install: all |
| 42 | - @if [ ! -O "$(BINDIR)" ] ; then \ | | 45 | - @if [ ! -O "$(BINDIR)" ] ; then \ |
| 43 | - echo "File $(BINDIR) doesn't belong to you!" ; exit 1 ; fi | | 46 | - echo "File $(BINDIR) doesn't belong to you!" ; exit 1 ; fi |