]>
Commit | Line | Data |
---|---|---|
b2839a90 | 1 | --- freeswan-1.97/Makefile.inc Fri Apr 12 04:37:17 2002 |
2 | +++ freeswan-1.97/Makefile.inc.org Wed May 1 18:28:17 2002 | |
416f166e | 3 | @@ -45,7 +45,7 @@ |
4 | DESTDIR= | |
5 | ||
6 | # "local" part of tree, used in building other pathnames | |
7 | -INC_USRLOCAL=/usr/local | |
8 | +INC_USRLOCAL=/usr | |
9 | ||
10 | # PUBDIR is where the "ipsec" command goes; beware, many things define PATH | |
11 | # settings which are assumed to include it (or at least, to include *some* | |
12 | @@ -61,12 +61,12 @@ | |
13 | # location within INC_USRLOCAL | |
14 | INC_MANDIR=man | |
15 | # the full pathname | |
16 | -MANTREE=$(DESTDIR)$(INC_USRLOCAL)/$(INC_MANDIR) | |
17 | +MANTREE=$(DESTDIR)$(INC_USRLOCAL)/share/$(INC_MANDIR) | |
18 | # all relevant subdirectories of MANTREE | |
19 | MANPLACES=man3 man5 man8 | |
20 | ||
21 | # where configuration files go | |
22 | -FINALCONFDIR=/etc | |
23 | +FINALCONFDIR=/etc/ipsec | |
24 | CONFDIR=$(DESTDIR)$(FINALCONFDIR) | |
25 | ||
26 | # An attempt is made to automatically figure out where boot/shutdown scripts | |
b2839a90 | 27 | @@ -74,17 +74,18 @@ |
416f166e | 28 | # If none of those exists (or INC_RCDIRS is empty), INC_RCDEFAULT gets them. |
29 | # With a non-null DESTDIR, INC_RCDEFAULT will be used unless one of the | |
30 | # INC_RCDIRS directories has been pre-created under DESTDIR. | |
31 | -INC_RCDIRS=/etc/rc.d/init.d /etc/rc.d /etc/init.d /sbin/init.d | |
32 | -INC_RCDEFAULT=/etc/rc.d/init.d | |
33 | +#INC_RCDIRS=/etc/rc.d/init.d /etc/rc.d /etc/init.d /sbin/init.d | |
34 | +#INC_RCDEFAULT=/etc/rc.d/init.d | |
35 | ||
36 | # RCDIR is where boot/shutdown scripts go; FINALRCDIR is where they think | |
37 | # will finally be (so utils/Makefile can create a symlink in BINDIR to the | |
38 | # place where the boot/shutdown script will finally be, rather than the | |
39 | # place where it is installed). | |
40 | -FINALRCDIR=$(shell for d in $(INC_RCDIRS) ; \ | |
41 | - do if test -d $(DESTDIR)/$$d ; \ | |
42 | - then echo $$d ; exit 0 ; \ | |
43 | - fi ; done ; echo $(INC_RCDEFAULT) ) | |
b2839a90 | 44 | +#FINALRCDIR=$(shell for d in $(INC_RCDIRS) ; \ |
45 | +# do if test -d $(DESTDIR)/$$d ; \ | |
46 | +# then echo $$d ; exit 0 ; \ | |
47 | +# fi ; done ; echo $(INC_RCDEFAULT) ) | |
416f166e | 48 | +FINALRCDIR=/etc/rc.d/init.d |
49 | RCDIR=$(DESTDIR)$(FINALRCDIR) | |
50 | ||
51 | ||
b2839a90 | 52 | @@ -126,8 +127,8 @@ |
416f166e | 53 | |
54 | # extra compile flags, for userland and kernel stuff, e.g. -g for debug info | |
55 | # (caution, this stuff is still being sorted out, will change in future) | |
56 | -USERCOMPILE=-g -O3 | |
57 | -KLIPSCOMPILE=-O3 | |
58 | +USERCOMPILE=$(OPT_FLAGS) | |
59 | +KLIPSCOMPILE=$(OPT_FLAGS) | |
60 | ||
b2839a90 | 61 | # command used to link/copy KLIPS into kernel source tree |
62 | # There are good reasons why this is "ln -s"; only people like distribution |