File openswan_01_build-paths.dif of Package openswan

--- doc/doxygen.cfg
+++ doc/doxygen.cfg	2008/09/05 07:20:05
@@ -984,7 +984,7 @@
 # The BIN_ABSPATH tag must point to the directory where the doxysearch binary 
 # is installed.
 
-BIN_ABSPATH            = /usr/local/bin/
+BIN_ABSPATH            = /usr/bin/
 
 # The EXT_DOC_PATHS tag can be used to specify one or more paths to 
 # documentation generated for other projects. This allows doxysearch to search 
--- Makefile.inc
+++ Makefile.inc	2008/09/05 07:20:47
@@ -48,8 +48,10 @@
 # it; DESTDIR itself should never appear in any other Makefile.
 DESTDIR?=
 
+LIBD=lib
+
 # "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*
@@ -58,7 +60,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)/$(LIBD)/ipsec
 LIBEXECDIR=$(DESTDIR)$(FINALBINDIR)
 
 FINALBINDIR=${FINALLIBEXECDIR}
@@ -70,13 +72,13 @@
 SBINDIR=$(DESTDIR)$(FINALSBINDIR)
 
 # libdir is where utility files go
-FINALLIBDIR?=$(INC_USRLOCAL)/lib/ipsec
+FINALLIBDIR?=$(INC_USRLOCAL)/lib/ipsec
 LIBDIR=$(DESTDIR)$(FINALLIBDIR)
 
 
 # where the appropriate manpage tree is located
 # location within INC_USRLOCAL
-INC_MANDIR=man
+INC_MANDIR=share/man
 # the full pathname
 MANTREE=$(DESTDIR)$(INC_USRLOCAL)/$(INC_MANDIR)
 # all relevant subdirectories of MANTREE
@@ -93,7 +95,7 @@
 CONFDDIR=$(DESTDIR)$(FINALCONFDDIR)
 
 # sample configuration files go into
-INC_DOCDIR?=share/doc
+INC_DOCDIR?=share/doc/packages
 FINALEXAMPLECONFDIR=${INC_USRLOCAL}/${INC_DOCDIR}/openswan
 EXAMPLECONFDIR=${DESTDIR}${FINALEXAMPLECONFDIR}
 
@@ -112,8 +114,8 @@
 # If none of those exists (or INC_RCDIRS is empty), INC_RCDEFAULT gets them.
 # With a non-null DESTDIR, INC_RCDEFAULT will be used unless one of the
 # INC_RCDIRS directories has been pre-created under DESTDIR.
-INC_RCDIRS=/etc/rc.d/init.d /etc/rc.d /etc/init.d /sbin/init.d
-INC_RCDEFAULT=/etc/rc.d/init.d
+INC_RCDIRS=/etc/init.d /etc/rc.d/init.d /etc/rc.d /sbin/init.d
+INC_RCDEFAULT=/etc/init.d
 
 # RCDIR is where boot/shutdown scripts go; FINALRCDIR is where they think
 # will finally be (so utils/Makefile can create a symlink in BINDIR to the
--- Makefile.top
+++ Makefile.top	2008/09/05 07:20:05
@@ -41,7 +41,7 @@
 install_file_list:
 	@for d in $(SUBDIRS) ; \
 	do \
-		(cd $$d && $(MAKE) --no-print-directory srcdir=${OPENSWANSRCDIR}/$$d/ OPENSWANSRCDIR=${OPENSWANSRCDIR} install_file_list ) || exit 1; \
+		(cd $$d && $(MAKE) --no-print-directory LIBD=$(LIBD) srcdir=${OPENSWANSRCDIR}/$$d/ OPENSWANSRCDIR=${OPENSWANSRCDIR} install_file_list ) || exit 1; \
 	done; 
 
 # uninstall, as much as possible
@@ -86,13 +86,13 @@
 ifneq ($(strip(${REGRESSRESULTS})),)
 	mkdir -p ${REGRESSRESULTS}
 endif
-	@for d in $(SUBDIRS); do (cd $$d && $(MAKE) DESTDIR=${DESTDIR} checkprograms || exit 1); done
+	@for d in $(SUBDIRS); do (cd $$d && $(MAKE) DESTDIR=${DESTDIR} LIBD=$(LIBD) checkprograms || exit 1); done
 	@for d in $(SUBDIRS); \
 	do \
 		echo ===================================; \
 		echo Now making check in $$d; \
 		echo ===================================; \
-		(cd $$d && $(MAKE) DESTDIR=${DESTDIR} check || exit 1);\
+		(cd $$d && $(MAKE) DESTDIR=${DESTDIR} LIBD=$(LIBD) check || exit 1);\
 	done
 ifneq ($(strip(${REGRESSRESULTS})),)
 	-perl testing/utils/regress-summarize-results.pl ${REGRESSRESULTS}