1 diff -ruN freeswan-1.8.orig/Makefile freeswan-1.8/Makefile
2 --- freeswan-1.8.orig/Makefile Thu Nov 30 05:25:05 2000
3 +++ freeswan-1.8/Makefile Tue Dec 12 19:00:31 2000
5 # PUBDIR is where the "ipsec" command goes; beware, many things define PATH
6 # settings which are assumed to include it (or at least, to include *some*
7 # copy of the "ipsec" command).
8 -PUBDIR=$(DESTDIR)/usr/local/sbin
9 +PUBDIR=$(DESTDIR)/usr/sbin
10 # PRIVDIR is where commands get put, REALPRIVDIR is where they think they
11 # will be run from in the end (currently only used by utils/ipsec)
12 -REALPRIVDIR=/usr/local/lib/ipsec
13 +REALPRIVDIR=/usr/lib/ipsec
14 PRIVDIR=$(DESTDIR)$(REALPRIVDIR)
16 -MANTREE=$(DESTDIR)/usr/local/man
17 +MANTREE=$(DESTDIR)/usr/share/man
18 # all relevant manpage subdirectories
19 MANPLACES=man3 man5 man8
20 # where configuration files go
21 -CONFDIR=$(DESTDIR)/etc
22 +CONFDIR=$(DESTDIR)/etc/freeswan
23 # RCDIR is where boot/shutdown scripts go (first RCDIRS that exists gets it);
24 # REALRCDIR is where they think they will ultimately be (for utils/Makefile)
25 -RCDIRS=/etc/rc.d/init.d /etc/rc.d /etc/init.d /sbin/init.d
26 -REALRCDIR=$(shell for d in $(RCDIRS) ; \
27 - do if test -d $$d ; \
28 - then echo $$d ; exit 0 ; \
29 - fi ; done ; echo /etc/rc.d/init.d )
30 +REALRCDIR=/etc/rc.d/init.d
31 RCDIR=$(DESTDIR)$(REALRCDIR)
33 # kernel location, and location of kernel patches in the distribution
34 diff -ruN freeswan-1.8.orig/klips/utils/Makefile freeswan-1.8/klips/utils/Makefile
35 --- freeswan-1.8.orig/klips/utils/Makefile Fri Jun 30 08:20:25 2000
36 +++ freeswan-1.8/klips/utils/Makefile Tue Dec 12 19:01:34 2000
41 -CFLAGS=-O2 -I../net/ipsec -I../../lib -g
42 +CFLAGS=$(OPT_FLAGS) -I../net/ipsec -I../../lib -g
45 #CFLAGS+= -Wconversion
47 CFLAGS+= -Wbad-function-cast
49 ALL=spi eroute spigrp tncfg klipsdebug
50 -BINDIR=/usr/local/lib/ipsec
51 -MANTREE=/usr/local/man
52 +BINDIR=/usr/lib/ipsec
53 +MANTREE=/usr/share/man
54 MANDIR8=$(MANTREE)/man8
55 MANDIR5=$(MANTREE)/man5
56 FREESWANLIB=../../lib/libfreeswan.a
57 diff -ruN freeswan-1.8.orig/lib/Makefile freeswan-1.8/lib/Makefile
58 --- freeswan-1.8.orig/lib/Makefile Thu Oct 26 01:58:57 2000
59 +++ freeswan-1.8/lib/Makefile Tue Dec 12 19:03:01 2000
61 HDRS=freeswan.h internal.h
65 +CFLAGS=$(OPT_FLAGS) -I.
66 # Add debugging symbols
73 -MANTREE=/usr/local/man
74 +MANTREE=/usr/share/man
75 MANDIR=$(MANTREE)/man3
76 MANS=anyaddr.3 atoaddr.3 atoasr.3 atosa.3 atoul.3 goodmask.3 \
77 initaddr.3 initsubnet.3 optionsfrom.3 portof.3 rangetosubnet.3 \
79 all: $(EXTHDRS) $(LIB) $(EXTLIBS)
83 + mkdir -p $(DESTDIR)$(MANDIR)
86 - $(INSTALL) $$f $(MANDIR)/ipsec_$$f || exit 1 ; \
87 - ../utils/manlink $(MANDIR) ipsec_$$f ; \
88 + $(INSTALL) $$f $(DESTDIR)$(MANDIR)/ipsec_$$f || exit 1 ; \
89 + ../utils/manlink $(DESTDIR)$(MANDIR) ipsec_$$f ; \
93 diff -ruN freeswan-1.8.orig/libdes/Makefile freeswan-1.8/libdes/Makefile
94 --- freeswan-1.8.orig/libdes/Makefile Wed Oct 11 04:12:45 2000
95 +++ freeswan-1.8/libdes/Makefile Tue Dec 12 19:06:18 2000
99 #CFLAG= -O4 -funroll-loops -fomit-frame-pointer
100 -CFLAG= -O3 -fomit-frame-pointer
101 +CFLAG=-fomit-frame-pointer
103 -CFLAGS=$(OPTS) $(CFLAG)
104 +CFLAGS=$(OPT_FLAGS) $(CFLAG)
109 #DES_ENC=asm/dx86-sol.o asm/yx86-sol.o # solaris format x86
110 #DES_ENC=asm/dx86bsdi.o asm/yx86basi.o # bsdi format x86
112 -LIBDIR=/usr/local/lib
113 -BINDIR=/usr/local/bin
114 -INCDIR=/usr/local/include
115 -MANDIR=/usr/local/man
119 +MANDIR=/usr/share/man
123 @@ -231,20 +231,16 @@
124 chmod 644 $(INSTALLTOP)/include/des.h; \
126 echo Standalone install; \
127 - cp $(DLIB) $(LIBDIR)/$(DLIB); \
128 + cp $(DLIB) $(DESTDIR)$(LIBDIR)/$(DLIB); \
129 if test -s /bin/ranlib; then \
130 - /bin/ranlib $(LIBDIR)/$(DLIB); \
131 + /bin/ranlib $(DESTDIR)$(LIBDIR)/$(DLIB); \
133 if test -s /usr/bin/ranlib; then \
134 /usr/bin/ranlib $(LIBDIR)/$(DLIB); \
137 - chmod 644 $(LIBDIR)/$(DLIB); \
138 - cp des_crypt.man $(MANDIR)/man$(MAN3)/des_crypt.$(MAN3); \
139 - chmod 644 $(MANDIR)/man$(MAN3)/des_crypt.$(MAN3); \
140 - cp des.man $(MANDIR)/man$(MAN1)/des.$(MAN1); \
141 - chmod 644 $(MANDIR)/man$(MAN1)/des.$(MAN1); \
142 - cp des.h $(INCDIR)/des.h; \
143 - chmod 644 $(INCDIR)/des.h; \
144 + cp des_crypt.man $(DESTDIR)$(MANDIR)/man$(MAN3)/des_crypt.$(MAN3); \
145 + cp des.man $(DESTDIR)$(MANDIR)/man$(MAN1)/des.$(MAN1); \
146 + cp des.h $(DESTDIR)$(INCDIR)/des.h; \
148 # DO NOT DELETE THIS LINE -- make depend depends on it.
149 diff -ruN freeswan-1.8.orig/pluto/Makefile freeswan-1.8/pluto/Makefile
150 --- freeswan-1.8.orig/pluto/Makefile Thu Oct 26 01:58:15 2000
151 +++ freeswan-1.8/pluto/Makefile Tue Dec 12 19:09:07 2000
155 # directory in which to install programs
156 -BINDIR=/usr/local/lib/ipsec
157 +BINDIR=/usr/lib/ipsec
159 # directory in which to install man pages
160 -MANTREE=/usr/local/man
161 +MANTREE=/usr/share/man
162 FMANDIR=$(MANTREE)/man5
163 PMANDIR=$(MANTREE)/man8
167 # -O on Linux makes gcc coredump when compiling sha1.c
168 # -Wundef is nice but RHL5.2 compiler doesn't support it
169 -CFLAGS = -g -Wall -W -Wmissing-prototypes -Wpointer-arith -Wbad-function-cast \
170 +CFLAGS = $(OPT_FLAGS) -Wall -W -Wmissing-prototypes -Wpointer-arith -Wbad-function-cast \
171 -Wcast-qual -Wmissing-declarations -Wwrite-strings -Wstrict-prototypes
173 # where to find klips headers and FreeS/WAN headers
176 CPPFLAGS = $(HDRDIRS) $(BYTE_ORDER) \
177 -DPLUTO -DKLIPS -DDODGE_DH_MISSING_ZERO_BUG \
179 + -DDEBUG -DGCC_LINT -DSHARED_SECRETS_FILE='"/etc/freeswan/ipsec.secrets"'
181 ALLFLAGS = $(CPPFLAGS) $(CFLAGS)
183 diff -ruN freeswan-1.8.orig/utils/Makefile freeswan-1.8/utils/Makefile
184 --- freeswan-1.8.orig/utils/Makefile Thu Oct 26 01:57:22 2000
185 +++ freeswan-1.8/utils/Makefile Tue Dec 12 19:10:13 2000
189 # pathnames, subject to overrides from main Makefile
190 -PUBDIR=/usr/local/sbin
191 -PRIVDIR=/usr/local/lib/ipsec
192 -REALPRIVDIR=/usr/local/lib/ipsec
194 +PRIVDIR=/usr/lib/ipsec
195 +REALPRIVDIR=/usr/lib/ipsec
196 RCDIR=/etc/rc.d/init.d
197 REALRCDIR=/etc/rc.d/init.d
199 -MANTREE=/usr/local/man
200 +CONFDIR=/etc/freeswan
201 +MANTREE=/usr/share/man
203 FMANDIR=$(MANTREE)/man5
204 CMANDIR=$(MANTREE)/man8