]>
Commit | Line | Data |
---|---|---|
aaf2feac SZ |
1 | diff -Naur freeswan-1.95/Makefile.inc freeswan-1.95-p/Makefile.inc |
2 | --- freeswan-1.95/Makefile.inc Fri Feb 1 04:26:40 2002 | |
3 | +++ freeswan-1.95-p/Makefile.inc Thu Feb 7 19:23:59 2002 | |
4 | @@ -45,7 +45,7 @@ | |
5 | DESTDIR= | |
6 | ||
7 | # "local" part of tree, used in building other pathnames | |
8 | -INC_USRLOCAL=/usr/local | |
9 | +INC_USRLOCAL=/usr | |
10 | ||
0955d6b3 JK |
11 | # PUBDIR is where the "ipsec" command goes; beware, many things define PATH |
12 | # settings which are assumed to include it (or at least, to include *some* | |
aaf2feac SZ |
13 | @@ -80,10 +80,7 @@ |
14 | # will finally be (so utils/Makefile can create a symlink in BINDIR to the | |
15 | # place where the boot/shutdown script will finally be, rather than the | |
16 | # place where it is installed). | |
17 | -FINALRCDIR=$(shell for d in $(INC_RCDIRS) ; \ | |
18 | - do if test -d $(DESTDIR)/$$d ; \ | |
7cfbbab1 | 19 | - then echo $$d ; exit 0 ; \ |
aaf2feac SZ |
20 | - fi ; done ; echo $(INC_RCDEFAULT) ) |
21 | +FINALRCDIR=/etc/rc.d/init.d | |
22 | RCDIR=$(DESTDIR)$(FINALRCDIR) | |
7cfbbab1 | 23 | |
7cfbbab1 | 24 | |
aaf2feac | 25 | @@ -124,8 +121,8 @@ |
0e5fb54e | 26 | |
aaf2feac SZ |
27 | # extra compile flags, for userland and kernel stuff, e.g. -g for debug info |
28 | # (caution, this stuff is still being sorted out, will change in future) | |
29 | -USERCOMPILE=-g -O3 | |
30 | -KLIPSCOMPILE=-O3 | |
31 | +USERCOMPILE=$(OPT_FLAGS) | |
32 | +KLIPSCOMPILE=$(OPT_FLAGS) | |
7cfbbab1 | 33 | |
aaf2feac SZ |
34 | # extra options for use in kernel build |
35 | KERNMAKEOPTS= | |
36 | diff -Naur freeswan-1.95/pluto/Makefile freeswan-1.95-p/pluto/Makefile | |
37 | --- freeswan-1.95/pluto/Makefile Tue Nov 27 17:33:42 2001 | |
38 | +++ freeswan-1.95-p/pluto/Makefile Thu Feb 7 19:26:29 2002 | |
39 | @@ -71,7 +71,8 @@ | |
7cfbbab1 JK |
40 | |
41 | CPPFLAGS = $(HDRDIRS) $(BYTE_ORDER) \ | |
0e5fb54e | 42 | -DPLUTO -DKLIPS -DDODGE_DH_MISSING_ZERO_BUG \ |
aaf2feac | 43 | - -DDEBUG -DGCC_LINT # -DLEAK_DETECTIVE |
7cfbbab1 | 44 | + -DDEBUG -DGCC_LINT -DSHARED_SECRETS_FILE='"/etc/freeswan/ipsec.secrets"' |
aaf2feac | 45 | + # -DLEAK_DETECTIVE |
7cfbbab1 JK |
46 | |
47 | ALLFLAGS = $(CPPFLAGS) $(CFLAGS) | |
48 |