1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
|
diff -Nuard openswan-2.1.2.orig/Makefile.inc openswan-2.1.2/Makefile.inc
--- openswan-2.1.2.orig/Makefile.inc 2004-05-07 05:12:52.000000000 +0200
+++ openswan-2.1.2/Makefile.inc 2004-05-25 12:02:02.000000000 +0200
@@ -62,7 +62,7 @@
DESTDIR?=
# "local" part of tree, used in building other pathnames
-INC_USRLOCAL=/usr/local
+INC_USRLOCAL=/usr
# PUBDIR is where the "ipsec" command goes; beware, many things define PATH
# settings which are assumed to include it (or at least, to include *some*
@@ -71,7 +71,7 @@
# BINDIR is where sub-commands get put, FINALBINDIR is where the "ipsec"
# command will look for them when it is run. Also called LIBEXECDIR.
-FINALLIBEXECDIR=$(INC_USRLOCAL)/libexec/ipsec
+FINALLIBEXECDIR=$(INC_USRLOCAL)/lib/ipsec
LIBEXECDIR=$(DESTDIR)$(FINALBINDIR)
FINALBINDIR=${FINALLIBEXECDIR}
@@ -91,7 +91,7 @@
# location within INC_USRLOCAL
INC_MANDIR=man
# the full pathname
-MANTREE=$(DESTDIR)$(INC_USRLOCAL)/$(INC_MANDIR)
+MANTREE=$(DESTDIR)$(INC_USRLOCAL)/share/$(INC_MANDIR)
# all relevant subdirectories of MANTREE
MANPLACES=man3 man5 man8
@@ -294,7 +294,7 @@
USE_OE?=no
ifeq ($(USE_OE),no)
# warning: examples subdirectory is statically defined here
-OE_FLAG=\#Disable Opportunistic Encryption\\ninclude ${FINALCONFDDIR}/examples/no_oe.conf
+OE_FLAG=\#Disable Opportunistic Encryption\\ninclude ${FINALCONFDDIR}/no_oe.conf
else
endif
--- openswan-2.4.9/programs/examples/Makefile~ 2007-10-01 15:45:22.000000000 +0300
+++ openswan-2.4.9/programs/examples/Makefile 2007-10-01 15:59:30.299660808 +0300
@@ -16,7 +16,7 @@
OPENSWANSRCDIR?=$(shell cd ../..; pwd)
include ${OPENSWANSRCDIR}/Makefile.inc
-CONFDSUBDIR=examples
+CONFDSUBDIR=.
CONFDFILES=no_oe.conf l2tp-cert.conf l2tp-cert-orgWIN2KXP.conf l2tp-psk.conf l2tp-psk-orgWIN2KXP.conf linux-linux.conf sysctl.conf
include ${srcdir}../Makefile.program
|
