| @@ -1,39 +1,41 @@ | | | @@ -1,39 +1,41 @@ |
1 | $NetBSD: patch-aa,v 1.3 2006/11/03 09:07:30 joerg Exp $ | | 1 | $NetBSD: patch-aa,v 1.4 2014/02/14 04:14:40 rodent Exp $ |
2 | | | 2 | |
3 | --- Makefile.orig 2003-08-07 15:40:30.000000000 +0000 | | 3 | Don't hardcode CC, CFLAGS, PREFIX. Fix installation stage. |
| | | 4 | |
| | | 5 | --- Makefile.orig 2003-08-07 15:40:39.000000000 +0000 |
4 | +++ Makefile | | 6 | +++ Makefile |
5 | @@ -1,12 +1,10 @@ | | 7 | @@ -1,7 +1,6 @@ |
| | | 8 | ################################################################## |
| | | 9 | # Directories |
| | | 10 | # Install dirs |
| | | 11 | -INSTALL_PREFIX = /usr/local |
| | | 12 | |
| | | 13 | # Full default path is /usr/local/bin |
| | | 14 | APG_BIN_DIR = /bin |
| | | 15 | @@ -60,12 +59,10 @@ APG_CLIBS += -lcrypt |
6 | ################################################################## | | 16 | ################################################################## |
7 | # You can modify CC variable if you have compiler other than GCC | | 17 | # You can modify CC variable if you have compiler other than GCC |
8 | # But the code was designed and tested with GCC | | 18 | # But the code was designed and tested with GCC |
9 | -CC = gcc | | 19 | -CC = gcc |
10 | | | 20 | |
11 | ################################################################## | | 21 | ################################################################## |
12 | # Compilation flags | | 22 | # Compilation flags |
13 | # You should comment the line below for AIX+native cc | | 23 | # You should comment the line below for AIX+native cc |
14 | -FLAGS = -Wall | | 24 | -CFLAGS = -Wall |
15 | | | 25 | |
16 | ################################################################## | | 26 | #################################################################### |
17 | # Libraries | | 27 | # If you plan to install APG daemon you should look at lines below # |
18 | @@ -39,7 +37,6 @@ USE_SHA = APG_DONOTUSE_SHA | | 28 | @@ -143,24 +140,12 @@ strip: |
19 | ################################################################## | | | |
20 | # Directories | | | |
21 | # Install dirs | | | |
22 | -INSTALL_PREFIX = /usr/local | | | |
23 | APG_BIN_DIR = /bin | | | |
24 | APG_MAN_DIR = /man/man1 | | | |
25 | APGD_BIN_DIR = /sbin | | | |
26 | @@ -110,24 +107,12 @@ strip: | | | |
27 | strip ${BFM_PROGNAME} | | 29 | strip ${BFM_PROGNAME} |
28 | | | 30 | |
29 | install: | | 31 | install: |
30 | - if test -x ./apg; then \ | | 32 | - if test -x ./apg; then \ |
31 | -./mkinstalldirs ${INSTALL_PREFIX}${APG_BIN_DIR}; \ | | 33 | -./mkinstalldirs ${INSTALL_PREFIX}${APG_BIN_DIR}; \ |
32 | -./mkinstalldirs ${INSTALL_PREFIX}${APG_MAN_DIR}; \ | | 34 | -./mkinstalldirs ${INSTALL_PREFIX}${APG_MAN_DIR}; \ |
33 | -./install-sh -c -m 0755 -o root -g ${FIND_GROUP} ./apg ${INSTALL_PREFIX}${APG_BIN_DIR}; \ | | 35 | -./install-sh -c -m 0755 -o root -g ${FIND_GROUP} ./apg ${INSTALL_PREFIX}${APG_BIN_DIR}; \ |
34 | -./install-sh -c -m 0444 ./doc/man/apg.1 ${INSTALL_PREFIX}${APG_MAN_DIR}; \ | | 36 | -./install-sh -c -m 0444 ./doc/man/apg.1 ${INSTALL_PREFIX}${APG_MAN_DIR}; \ |
35 | -fi | | 37 | -fi |
36 | - if test -x ./apgd; then \ | | 38 | - if test -x ./apgd; then \ |
37 | -./mkinstalldirs ${INSTALL_PREFIX}${APGD_BIN_DIR}; \ | | 39 | -./mkinstalldirs ${INSTALL_PREFIX}${APGD_BIN_DIR}; \ |
38 | -./mkinstalldirs ${INSTALL_PREFIX}${APGD_MAN_DIR}; \ | | 40 | -./mkinstalldirs ${INSTALL_PREFIX}${APGD_MAN_DIR}; \ |
39 | -./install-sh -c -m 0755 -o root -g ${FIND_GROUP} ./apgd ${INSTALL_PREFIX}${APGD_BIN_DIR}; \ | | 41 | -./install-sh -c -m 0755 -o root -g ${FIND_GROUP} ./apgd ${INSTALL_PREFIX}${APGD_BIN_DIR}; \ |