src/patches/openswan-2.6.24_noxmlto.patch

   1 diff -Naur openswan-2.6.24.org/programs/_confread/Makefile openswan-2.6.24/programs/_confread/Makefile
   2 --- openswan-2.6.24.org/programs/_confread/Makefile     2010-01-10 02:34:38.000000000 +0100
   3 +++ openswan-2.6.24/programs/_confread/Makefile 2010-01-10 22:44:33.000000000 +0100
   4 @@ -16,7 +16,13 @@
   5  OPENSWANSRCDIR?=$(shell cd ../..; pwd)
   6  include ${OPENSWANSRCDIR}/Makefile.inc
   7
   8 -EXTRA5MAN=ipsec.conf.5
   9 +SUBDIRS=doc lib programs testing
  10 +ifeq ($(findstring $(SUBDIRS),doc),doc)
  11 +  EXTRA5MAN=ipsec.conf.5
  12 +else
  13 +  EXTRA5MAN=
  14 +endif
  15 +
  16  CONFFILES=ipsec.conf
  17  EXCONFILES=ipsec.win2k.conf
  18  SOURCEDIR=_confread
  19 diff -Naur openswan-2.6.24.org/programs/pluto/Makefile openswan-2.6.24/programs/pluto/Makefile
  20 --- openswan-2.6.24.org/programs/pluto/Makefile 2010-01-10 02:34:38.000000000 +0100
  21 +++ openswan-2.6.24/programs/pluto/Makefile     2010-01-10 22:51:15.000000000 +0100
  22 @@ -172,7 +172,7 @@
  23  all: $(BINNAMEPLUTO) $(BINNAMEADNSIFNEEDED) $(BINNAMEWHACK) #$(BINNAMEWHACKINIT)
  24  programs: $(BINNAMEPLUTO) $(BINNAMEADNSIFNEEDED) $(BINNAMEWHACK) #$(BINNAMEWHACKINIT)
  25  clean: cleanall
  26 -install: doinstall
  27 +install: doinstall doinstalldoc
  28  endif
  29
  30  doinstall: all
  31 @@ -188,6 +188,9 @@
  32         $(INSTALL) $(INSTBINFLAGS) $(BINNAMEPLUTO) $(BINNAMEWHACK) $(LIBEXECDIR)
  33         #$(INSTALL) $(INSTSUIDFLAGS) $(BINNAMEWHACKINIT) $(LIBEXECDIR)
  34         if $(USE_ADNS) ; then $(INSTALL) $(INSTBINFLAGS) $(BINNAMEADNS)  $(LIBEXECDIR) ; fi
  35 +
  36 +ifeq ($(findstring $(SUBDIRS),doc),doc)
  37 +doinstalldoc:
  38         $(INSTALL) $(INSTMANFLAGS) ${srcdir}pluto.8 $(PMANDIR)/ipsec_pluto.8
  39         sh ${OPENSWANSRCDIR}/packaging/utils/manlink ${srcdir}pluto.8 | \
  40                 while read from to ; \
  41 @@ -201,10 +204,7 @@
  42                  ln -s -f $$from $(FMANDIR)/$$to; \
  43                 done
  44
  45 -install_file_list:
  46 -       @echo $(LIBEXECDIR)/$(BINNAMEPLUTO)
  47 -       @if $(USE_ADNS) ; then echo $(LIBDIR)/$(BINNAMEADNS) ; fi
  48 -       @echo $(LIBEXECDIR)/$(BINNAMEWHACK)
  49 +install_file_listdoc:
  50         @echo $(PMANDIR)/ipsec_pluto.8
  51         @sh ${OPENSWANSRCDIR}/packaging/utils/manlink pluto.8 | \
  52                 while read from to; \
  53 @@ -217,6 +217,15 @@
  54                 do \
  55                         echo $(FMANDIR)/$$to; \
  56                 done
  57 +else
  58 +doinstalldoc:
  59 +install_file_listdoc:
  60 +endif
  61 +
  62 +install_file_list: install_file_listdoc
  63 +       @echo $(LIBEXECDIR)/$(BINNAMEPLUTO)
  64 +       @if $(USE_ADNS) ; then echo $(LIBDIR)/$(BINNAMEADNS) ; fi
  65 +       @echo $(LIBEXECDIR)/$(BINNAMEWHACK)
  66
  67  alg_info_test: alg_info_test.o ike_alg.o constants.o defs.o log.o db_ops.o crypto.o $(LIBDESLITE) $(OPENSWANLIB)
  68         $(CC) -o $@ $^ $(LDFLAGS) $(LIBSPLUTO)