Fixed merge, don't know why this didn't happen automatically - maybe a leftover from the svn->git conversion

2 files changed, 59 insertions, 0 deletions

diff --git a/src/_copyright/Makefile.am b/src/_copyright/Makefile.am
index 33c4ffc23..edffcfc25 100644
--- a/src/_copyright/Makefile.am
+++ b/src/_copyright/Makefile.am
@@ -1,6 +1,9 @@
 ipsec_PROGRAMS = _copyright
 _copyright_SOURCES = _copyright.c
+<<<<<<< HEAD
 dist_man8_MANS = _copyright.8
+=======
+>>>>>>> upstream/4.5.1
 
 INCLUDES = \
 -I$(top_srcdir)/src/libfreeswan \
diff --git a/src/_copyright/Makefile.in b/src/_copyright/Makefile.in
index 58ebb523c..321eeadea 100644
--- a/src/_copyright/Makefile.in
+++ b/src/_copyright/Makefile.in
@@ -36,8 +36,12 @@ build_triplet = @build@
 host_triplet = @host@
 ipsec_PROGRAMS = _copyright$(EXEEXT)
 subdir = src/_copyright
+<<<<<<< HEAD
 DIST_COMMON = $(dist_man8_MANS) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in
+=======
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+>>>>>>> upstream/4.5.1
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/config/libtool.m4 \
 	$(top_srcdir)/m4/config/ltoptions.m4 \
@@ -53,7 +57,11 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 mkinstalldirs = $(install_sh) -d
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+<<<<<<< HEAD
 am__installdirs = "$(DESTDIR)$(ipsecdir)" "$(DESTDIR)$(man8dir)"
+=======
+am__installdirs = "$(DESTDIR)$(ipsecdir)"
+>>>>>>> upstream/4.5.1
 PROGRAMS = $(ipsec_PROGRAMS)
 am__copyright_OBJECTS = _copyright.$(OBJEXT)
 _copyright_OBJECTS = $(am__copyright_OBJECTS)
@@ -75,6 +83,7 @@ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	$(LDFLAGS) -o $@
 SOURCES = $(_copyright_SOURCES)
 DIST_SOURCES = $(_copyright_SOURCES)
+<<<<<<< HEAD
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -99,6 +108,8 @@ am__base_list = \
 man8dir = $(mandir)/man8
 NROFF = nroff
 MANS = $(dist_man8_MANS)
+=======
+>>>>>>> upstream/4.5.1
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -221,9 +232,13 @@ includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 ipsecdir = @ipsecdir@
+<<<<<<< HEAD
 ipsecgid = @ipsecgid@
 ipsecgroup = @ipsecgroup@
 ipsecuid = @ipsecuid@
+=======
+ipsecgroup = @ipsecgroup@
+>>>>>>> upstream/4.5.1
 ipsecuser = @ipsecuser@
 libcharon_plugins = @libcharon_plugins@
 libdir = @libdir@
@@ -262,6 +277,11 @@ sbindir = @sbindir@
 scepclient_plugins = @scepclient_plugins@
 scripts_plugins = @scripts_plugins@
 sharedstatedir = @sharedstatedir@
+<<<<<<< HEAD
+=======
+soup_CFLAGS = @soup_CFLAGS@
+soup_LIBS = @soup_LIBS@
+>>>>>>> upstream/4.5.1
 srcdir = @srcdir@
 strongswan_conf = @strongswan_conf@
 sysconfdir = @sysconfdir@
@@ -273,7 +293,10 @@ urandom_device = @urandom_device@
 xml_CFLAGS = @xml_CFLAGS@
 xml_LIBS = @xml_LIBS@
 _copyright_SOURCES = _copyright.c
+<<<<<<< HEAD
 dist_man8_MANS = _copyright.8
+=======
+>>>>>>> upstream/4.5.1
 INCLUDES = \
 -I$(top_srcdir)/src/libfreeswan \
 -I$(top_srcdir)/src/libstrongswan
@@ -394,6 +417,7 @@ mostlyclean-libtool:
 
 clean-libtool:
 	-rm -rf .libs _libs
+<<<<<<< HEAD
 install-man8: $(dist_man8_MANS)
 	@$(NORMAL_INSTALL)
 	test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
@@ -428,6 +452,8 @@ uninstall-man8:
 	test -z "$$files" || { \
 	  echo " ( cd '$(DESTDIR)$(man8dir)' && rm -f" $$files ")"; \
 	  cd "$(DESTDIR)$(man8dir)" && rm -f $$files; }
+=======
+>>>>>>> upstream/4.5.1
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -482,6 +508,7 @@ distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
+<<<<<<< HEAD
 	@list='$(MANS)'; if test -n "$$list"; then \
 	  list=`for p in $$list; do \
 	    if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
@@ -495,6 +522,8 @@ distdir: $(DISTFILES)
 	    exit 1; \
 	  else :; fi; \
 	else :; fi
+=======
+>>>>>>> upstream/4.5.1
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
@@ -526,9 +555,15 @@ distdir: $(DISTFILES)
 	done
 check-am: all-am
 check: check-am
+<<<<<<< HEAD
 all-am: Makefile $(PROGRAMS) $(MANS)
 installdirs:
 	for dir in "$(DESTDIR)$(ipsecdir)" "$(DESTDIR)$(man8dir)"; do \
+=======
+all-am: Makefile $(PROGRAMS)
+installdirs:
+	for dir in "$(DESTDIR)$(ipsecdir)"; do \
+>>>>>>> upstream/4.5.1
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
@@ -579,7 +614,11 @@ info: info-am
 
 info-am:
 
+<<<<<<< HEAD
 install-data-am: install-ipsecPROGRAMS install-man
+=======
+install-data-am: install-ipsecPROGRAMS
+>>>>>>> upstream/4.5.1
 
 install-dvi: install-dvi-am
 
@@ -595,7 +634,11 @@ install-info: install-info-am
 
 install-info-am:
 
+<<<<<<< HEAD
 install-man: install-man8
+=======
+install-man:
+>>>>>>> upstream/4.5.1
 
 install-pdf: install-pdf-am
 
@@ -625,9 +668,13 @@ ps: ps-am
 
 ps-am:
 
+<<<<<<< HEAD
 uninstall-am: uninstall-ipsecPROGRAMS uninstall-man
 
 uninstall-man: uninstall-man8
+=======
+uninstall-am: uninstall-ipsecPROGRAMS
+>>>>>>> upstream/4.5.1
 
 .MAKE: install-am install-strip
 
@@ -638,6 +685,7 @@ uninstall-man: uninstall-man8
 	install install-am install-data install-data-am install-dvi \
 	install-dvi-am install-exec install-exec-am install-html \
 	install-html-am install-info install-info-am \
+<<<<<<< HEAD
 	install-ipsecPROGRAMS install-man install-man8 install-pdf \
 	install-pdf-am install-ps install-ps-am install-strip \
 	installcheck installcheck-am installdirs maintainer-clean \
@@ -645,6 +693,14 @@ uninstall-man: uninstall-man8
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	tags uninstall uninstall-am uninstall-ipsecPROGRAMS \
 	uninstall-man uninstall-man8
+=======
+	install-ipsecPROGRAMS install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags uninstall uninstall-am uninstall-ipsecPROGRAMS
+>>>>>>> upstream/4.5.1
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.