diff options
Diffstat (limited to 'src/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 0edddc9fc..c631adff2 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -16,8 +16,21 @@ if USE_TLS SUBDIRS += libtls endif +<<<<<<< HEAD if USE_FILE_CONFIG SUBDIRS += libfreeswan starter ipsec _copyright +======= +if USE_LIBCHARON + SUBDIRS += libcharon +endif + +if USE_FILE_CONFIG + SUBDIRS += libfreeswan starter +endif + +if USE_IPSEC_SCRIPT + SUBDIRS += ipsec _copyright +>>>>>>> upstream/4.5.1 endif if USE_PLUTO @@ -25,7 +38,11 @@ if USE_PLUTO endif if USE_CHARON +<<<<<<< HEAD SUBDIRS += libcharon charon +======= + SUBDIRS += charon +>>>>>>> upstream/4.5.1 endif if USE_STROKE @@ -40,6 +57,13 @@ if USE_TOOLS SUBDIRS += libfreeswan openac scepclient pki endif +<<<<<<< HEAD +======= +if USE_CONFTEST + SUBDIRS += conftest +endif + +>>>>>>> upstream/4.5.1 if USE_DUMM SUBDIRS += dumm endif @@ -64,4 +88,8 @@ EXTRA_DIST = strongswan.conf install-exec-local : test -e "$(DESTDIR)${sysconfdir}" || $(INSTALL) -d "$(DESTDIR)$(sysconfdir)" +<<<<<<< HEAD test -e "$(DESTDIR)$(sysconfdir)/strongswan.conf" || $(INSTALL) -o ${ipsecuid} -g ${ipsecgid} -m 640 $(srcdir)/strongswan.conf $(DESTDIR)$(sysconfdir)/strongswan.conf || true +======= + test -e "$(DESTDIR)$(sysconfdir)/strongswan.conf" || $(INSTALL) -m 640 $(srcdir)/strongswan.conf $(DESTDIR)$(sysconfdir)/strongswan.conf || true +>>>>>>> upstream/4.5.1 |