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