Imported Upstream version 1.2.22upstream/1.2.22upstream

Change-Id: I4d17734839f021e46aef7a30483ac17e8c85fb1d
Signed-off-by: sangwan.kwon <sangwan.kwon@samsung.com>

4 files changed, 249 insertions, 128 deletions

diff --git a/man/Makefile.am b/man/Makefile.am
index 3b03a96e..e554319a 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,52 +1,75 @@
 NULL =
 
+XMLSEC1_MAN=$(builddir)/xmlsec1.1
+XMLSEC1_CONFIG_MAN=$(builddir)/xmlsec1-config.1
+
+XMLSEC1_MAN_SRC=$(srcdir)/xmlsec1.1
+XMLSEC1_CONFIG_MAN_SRC=$(srcdir)/xmlsec1-config.1
+
 man_MANS = \
-	xmlsec1.1 \
-	xmlsec1-config.1 \
+	$(XMLSEC1_MAN) \
+	$(XMLSEC1_CONFIG_MAN) \
 	$(NULL)
 
 EXTRA_DIST = \
-	xmlsec1.1 \
-	xmlsec1-config.1 \
+	$(XMLSEC1_MAN) \
+	$(XMLSEC1_CONFIG_MAN) \
 	$(NULL)
 
 XMLSEC_PROGRAM=$(top_builddir)/apps/xmlsec1
 XMLSEC_CONFIG_PROGRAM=$(top_builddir)/xmlsec1-config
-XMLSEC_HTML=$(top_builddir)/docs/xmlsec-man.html
-
-all:
-
-docs: man-clean man $(XMLSEC_HTML)
-	
 
-man-clean:
-	@rm -rf $(man_MANS)
+all: $(man_MANS) $(XMLSEC_HTML)
 
-man: $(man_MANS) 
 
-$(XMLSEC_HTML): xmlsec1.1
-	man2html xmlsec1.1 | \
-		  grep -v '^Content-type: text/html' | \
-		  tr "[:cntrl:]" " " > \
-		  $(XMLSEC_HTML)
-
-xmlsec1.1:
-	@rm -f xmlsec1.1
-	help2man --help-option=--help-all --no-info \
+if BUILD_MANPAGES
+$(XMLSEC1_MAN): $(XMLSEC_PROGRAM)
+	$(HELP2MAN) --help-option=--help-all --no-info \
 		  --name="sign, verify, encrypt and decrypt XML documents" \
 		  --version-option=--version \
-		  $(XMLSEC_PROGRAM) > xmlsec1.1
+		  --output=$(XMLSEC1_MAN) \
+		  $(XMLSEC_PROGRAM)
+else
+$(XMLSEC1_MAN):
+	@( \
+		echo "Copying xmlsec1 manpage ..."; \
+		if [ z"$(XMLSEC1_MAN_SRC)" != z"$(XMLSEC1_MAN)" ]; \
+		then \
+		   $(CP) -u $(XMLSEC1_MAN_SRC) $(XMLSEC1_MAN) ; \
+		fi \
+	)
+endif
 
-xmlsec1-config.1:
-	@chmod 766 $(XMLSEC_CONFIG_PROGRAM)
-	@rm -f xmlsec1-config.1
-	help2man --help-option=--help --no-info \
+if BUILD_MANPAGES
+$(XMLSEC1_CONFIG_MAN): $(XMLSEC_CONFIG_PROGRAM)
+	$(HELP2MAN) --help-option=--help --no-info \
 		  --name="detail installed version of xmlsec library" \
 		  --version-option=--version \
-		  $(XMLSEC_CONFIG_PROGRAM) > xmlsec1-config.1
+		  --output=$(XMLSEC1_CONFIG_MAN) \
+		  $(XMLSEC_CONFIG_PROGRAM)
+else
+$(XMLSEC1_CONFIG_MAN):
+	@( \
+		echo "Copying xmlsec1-config manpage ..."; \
+		if [ z"$(XMLSEC1_CONFIG_MAN_SRC)" != z"$(XMLSEC1_CONFIG_MAN)" ]; then \
+		    $(CP) -u $(XMLSEC1_CONFIG_MAN_SRC) $(XMLSEC1_CONFIG_MAN) ; \
+		fi \
+	)
+endif
 
 $(XMLSEC_PROGRAM): 
 	@cd ../apps;make
 
-clean:
+$(XMLSEC_CONFIG_PROGRAM):
+
 	
+clean-local:
+	( if [ z"$(XMLSEC1_MAN_SRC)" != z"$(XMLSEC1_MAN)" ]; then \
+		rm -rf $(XMLSEC1_MAN) ; \
+	fi )
+	( if [ z"$(XMLSEC1_CONFIG_MAN_SRC)" != z"$(XMLSEC1_CONFIG_MAN)" ];  then \
+		rm -rf $(XMLSEC1_CONFIG_MAN) ; \
+	fi )
+
+distclean-local: clean-local
+
diff --git a/man/Makefile.in b/man/Makefile.in
index 2f4c529c..d111b9af 100644
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,6 +14,61 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -34,26 +88,37 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = man
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
 	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/configure.in
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
 AM_V_GEN = $(am__v_GEN_@AM_V@)
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
 AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -85,6 +150,8 @@ man1dir = $(mandir)/man1
 am__installdirs = "$(DESTDIR)$(man1dir)"
 NROFF = nroff
 MANS = $(man_MANS)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -121,6 +188,10 @@ GNUTLS_CRYPTO_LIB = @GNUTLS_CRYPTO_LIB@
 GNUTLS_LIBS = @GNUTLS_LIBS@
 GNUTLS_MIN_VERSION = @GNUTLS_MIN_VERSION@
 GREP = @GREP@
+GTKDOC_MKDB = @GTKDOC_MKDB@
+GTKDOC_MKHTML = @GTKDOC_MKHTML@
+GTKDOC_MKTMPL = @GTKDOC_MKTMPL@
+GTKDOC_SCAN = @GTKDOC_SCAN@
 HELP2MAN = @HELP2MAN@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
@@ -140,6 +211,7 @@ LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
 LIBXSLT_CONFIG = @LIBXSLT_CONFIG@
 LIBXSLT_LIBS = @LIBXSLT_LIBS@
 LIBXSLT_MIN_VERSION = @LIBXSLT_MIN_VERSION@
+LIBXSLT_PC_FILE_COND = @LIBXSLT_PC_FILE_COND@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
@@ -178,6 +250,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
 PKGCONFIG_PRESENT = @PKGCONFIG_PRESENT@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
@@ -194,7 +267,6 @@ XMLSEC_APP_DEFINES = @XMLSEC_APP_DEFINES@
 XMLSEC_CFLAGS = @XMLSEC_CFLAGS@
 XMLSEC_CORE_CFLAGS = @XMLSEC_CORE_CFLAGS@
 XMLSEC_CORE_LIBS = @XMLSEC_CORE_LIBS@
-XMLSEC_CRYPTO = @XMLSEC_CRYPTO@
 XMLSEC_CRYPTO_CFLAGS = @XMLSEC_CRYPTO_CFLAGS@
 XMLSEC_CRYPTO_DISABLED_LIST = @XMLSEC_CRYPTO_DISABLED_LIST@
 XMLSEC_CRYPTO_EXTRA_LDFLAGS = @XMLSEC_CRYPTO_EXTRA_LDFLAGS@
@@ -202,6 +274,7 @@ XMLSEC_CRYPTO_LIB = @XMLSEC_CRYPTO_LIB@
 XMLSEC_CRYPTO_LIBS = @XMLSEC_CRYPTO_LIBS@
 XMLSEC_CRYPTO_LIST = @XMLSEC_CRYPTO_LIST@
 XMLSEC_CRYPTO_PC_FILES_LIST = @XMLSEC_CRYPTO_PC_FILES_LIST@
+XMLSEC_DEFAULT_CRYPTO = @XMLSEC_DEFAULT_CRYPTO@
 XMLSEC_DEFINES = @XMLSEC_DEFINES@
 XMLSEC_DL_INCLUDES = @XMLSEC_DL_INCLUDES@
 XMLSEC_DL_LIBS = @XMLSEC_DL_LIBS@
@@ -221,6 +294,7 @@ XMLSEC_NO_DSA = @XMLSEC_NO_DSA@
 XMLSEC_NO_GCRYPT = @XMLSEC_NO_GCRYPT@
 XMLSEC_NO_GNUTLS = @XMLSEC_NO_GNUTLS@
 XMLSEC_NO_GOST = @XMLSEC_NO_GOST@
+XMLSEC_NO_GOST2012 = @XMLSEC_NO_GOST2012@
 XMLSEC_NO_HMAC = @XMLSEC_NO_HMAC@
 XMLSEC_NO_LIBXSLT = @XMLSEC_NO_LIBXSLT@
 XMLSEC_NO_MD5 = @XMLSEC_NO_MD5@
@@ -235,7 +309,6 @@ XMLSEC_NO_SHA256 = @XMLSEC_NO_SHA256@
 XMLSEC_NO_SHA384 = @XMLSEC_NO_SHA384@
 XMLSEC_NO_SHA512 = @XMLSEC_NO_SHA512@
 XMLSEC_NO_X509 = @XMLSEC_NO_X509@
-XMLSEC_NO_XKMS = @XMLSEC_NO_XKMS@
 XMLSEC_NO_XMLDSIG = @XMLSEC_NO_XMLDSIG@
 XMLSEC_NO_XMLENC = @XMLSEC_NO_XMLENC@
 XMLSEC_NSS_CFLAGS = @XMLSEC_NSS_CFLAGS@
@@ -250,6 +323,7 @@ XMLSEC_VERSION_MAJOR = @XMLSEC_VERSION_MAJOR@
 XMLSEC_VERSION_MINOR = @XMLSEC_VERSION_MINOR@
 XMLSEC_VERSION_SAFE = @XMLSEC_VERSION_SAFE@
 XMLSEC_VERSION_SUBMINOR = @XMLSEC_VERSION_SUBMINOR@
+XSLTPROC = @XSLTPROC@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -303,19 +377,22 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 NULL = 
+XMLSEC1_MAN = $(builddir)/xmlsec1.1
+XMLSEC1_CONFIG_MAN = $(builddir)/xmlsec1-config.1
+XMLSEC1_MAN_SRC = $(srcdir)/xmlsec1.1
+XMLSEC1_CONFIG_MAN_SRC = $(srcdir)/xmlsec1-config.1
 man_MANS = \
-	xmlsec1.1 \
-	xmlsec1-config.1 \
+	$(XMLSEC1_MAN) \
+	$(XMLSEC1_CONFIG_MAN) \
 	$(NULL)
 
 EXTRA_DIST = \
-	xmlsec1.1 \
-	xmlsec1-config.1 \
+	$(XMLSEC1_MAN) \
+	$(XMLSEC1_CONFIG_MAN) \
 	$(NULL)
 
 XMLSEC_PROGRAM = $(top_builddir)/apps/xmlsec1
 XMLSEC_CONFIG_PROGRAM = $(top_builddir)/xmlsec1-config
-XMLSEC_HTML = $(top_builddir)/docs/xmlsec-man.html
 all: all-am
 
 .SUFFIXES:
@@ -331,7 +408,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu man/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu man/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -357,11 +433,18 @@ clean-libtool:
 	-rm -rf .libs _libs
 install-man1: $(man_MANS)
 	@$(NORMAL_INSTALL)
-	test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
-	@list=''; test -n "$(man1dir)" || exit 0; \
-	{ for i in $$list; do echo "$$i"; done; \
-	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-	  sed -n '/\.1[a-z]*$$/p'; \
+	@list1=''; \
+	list2='$(man_MANS)'; \
+	test -n "$(man1dir)" \
+	  && test -n "`echo $$list1$$list2`" \
+	  || exit 0; \
+	echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
+	$(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
+	{ for i in $$list1; do echo "$$i"; done;  \
+	if test -n "$$list2"; then \
+	  for i in $$list2; do echo "$$i"; done \
+	    | sed -n '/\.1[a-z]*$$/p'; \
+	fi; \
 	} | while read p; do \
 	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; echo "$$p"; \
@@ -391,27 +474,14 @@ uninstall-man1:
 	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
 	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
 	dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
-tags: TAGS
-TAGS:
+tags TAGS:
+
+ctags CTAGS:
 
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
 
 
 distdir: $(DISTFILES)
-	@list='$(MANS)'; if test -n "$$list"; then \
-	  list=`for p in $$list; do \
-	    if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-	    if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \
-	  if test -n "$$list" && \
-	    grep 'ab help2man is required to generate this page' $$list >/dev/null; then \
-	    echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \
-	    grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/         /' >&2; \
-	    echo "       to fix them, install help2man, remove and regenerate the man pages;" >&2; \
-	    echo "       typically \`make maintainer-clean' will remove them" >&2; \
-	    exit 1; \
-	  else :; fi; \
-	else :; fi
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
@@ -478,11 +548,13 @@ distclean-generic:
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
-clean-am: clean-generic clean-libtool mostlyclean-am
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-local mostlyclean-am
 
 distclean: distclean-am
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic
+distclean-am: clean-am distclean-generic distclean-local
 
 dvi: dvi-am
 
@@ -547,52 +619,66 @@ uninstall-man: uninstall-man1
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am 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 install-man install-man1 \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	uninstall uninstall-am uninstall-man uninstall-man1
-
-
-all:
-
-docs: man-clean man $(XMLSEC_HTML)
-
-man-clean:
-	@rm -rf $(man_MANS)
-
-man: $(man_MANS) 
-
-$(XMLSEC_HTML): xmlsec1.1
-	man2html xmlsec1.1 | \
-		  grep -v '^Content-type: text/html' | \
-		  tr "[:cntrl:]" " " > \
-		  $(XMLSEC_HTML)
-
-xmlsec1.1:
-	@rm -f xmlsec1.1
-	help2man --help-option=--help-all --no-info \
-		  --name="sign, verify, encrypt and decrypt XML documents" \
-		  --version-option=--version \
-		  $(XMLSEC_PROGRAM) > xmlsec1.1
-
-xmlsec1-config.1:
-	@chmod 766 $(XMLSEC_CONFIG_PROGRAM)
-	@rm -f xmlsec1-config.1
-	help2man --help-option=--help --no-info \
-		  --name="detail installed version of xmlsec library" \
-		  --version-option=--version \
-		  $(XMLSEC_CONFIG_PROGRAM) > xmlsec1-config.1
+	clean-local cscopelist-am ctags-am distclean distclean-generic \
+	distclean-libtool distclean-local distdir dvi dvi-am html \
+	html-am info info-am 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 install-man install-man1 install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
+	uninstall-am uninstall-man uninstall-man1
+
+.PRECIOUS: Makefile
+
+
+all: $(man_MANS) $(XMLSEC_HTML)
+
+@BUILD_MANPAGES_TRUE@$(XMLSEC1_MAN): $(XMLSEC_PROGRAM)
+@BUILD_MANPAGES_TRUE@	$(HELP2MAN) --help-option=--help-all --no-info \
+@BUILD_MANPAGES_TRUE@		  --name="sign, verify, encrypt and decrypt XML documents" \
+@BUILD_MANPAGES_TRUE@		  --version-option=--version \
+@BUILD_MANPAGES_TRUE@		  --output=$(XMLSEC1_MAN) \
+@BUILD_MANPAGES_TRUE@		  $(XMLSEC_PROGRAM)
+@BUILD_MANPAGES_FALSE@$(XMLSEC1_MAN):
+@BUILD_MANPAGES_FALSE@	@( \
+@BUILD_MANPAGES_FALSE@		echo "Copying xmlsec1 manpage ..."; \
+@BUILD_MANPAGES_FALSE@		if [ z"$(XMLSEC1_MAN_SRC)" != z"$(XMLSEC1_MAN)" ]; \
+@BUILD_MANPAGES_FALSE@		then \
+@BUILD_MANPAGES_FALSE@		   $(CP) -u $(XMLSEC1_MAN_SRC) $(XMLSEC1_MAN) ; \
+@BUILD_MANPAGES_FALSE@		fi \
+@BUILD_MANPAGES_FALSE@	)
+
+@BUILD_MANPAGES_TRUE@$(XMLSEC1_CONFIG_MAN): $(XMLSEC_CONFIG_PROGRAM)
+@BUILD_MANPAGES_TRUE@	$(HELP2MAN) --help-option=--help --no-info \
+@BUILD_MANPAGES_TRUE@		  --name="detail installed version of xmlsec library" \
+@BUILD_MANPAGES_TRUE@		  --version-option=--version \
+@BUILD_MANPAGES_TRUE@		  --output=$(XMLSEC1_CONFIG_MAN) \
+@BUILD_MANPAGES_TRUE@		  $(XMLSEC_CONFIG_PROGRAM)
+@BUILD_MANPAGES_FALSE@$(XMLSEC1_CONFIG_MAN):
+@BUILD_MANPAGES_FALSE@	@( \
+@BUILD_MANPAGES_FALSE@		echo "Copying xmlsec1-config manpage ..."; \
+@BUILD_MANPAGES_FALSE@		if [ z"$(XMLSEC1_CONFIG_MAN_SRC)" != z"$(XMLSEC1_CONFIG_MAN)" ]; then \
+@BUILD_MANPAGES_FALSE@		    $(CP) -u $(XMLSEC1_CONFIG_MAN_SRC) $(XMLSEC1_CONFIG_MAN) ; \
+@BUILD_MANPAGES_FALSE@		fi \
+@BUILD_MANPAGES_FALSE@	)
 
 $(XMLSEC_PROGRAM): 
 	@cd ../apps;make
 
-clean:
+$(XMLSEC_CONFIG_PROGRAM):
+
+clean-local:
+	( if [ z"$(XMLSEC1_MAN_SRC)" != z"$(XMLSEC1_MAN)" ]; then \
+		rm -rf $(XMLSEC1_MAN) ; \
+	fi )
+	( if [ z"$(XMLSEC1_CONFIG_MAN_SRC)" != z"$(XMLSEC1_CONFIG_MAN)" ];  then \
+		rm -rf $(XMLSEC1_CONFIG_MAN) ; \
+	fi )
+
+distclean-local: clean-local
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/man/xmlsec1-config.1 b/man/xmlsec1-config.1
index f79fcd0a..b78c3b15 100644
--- a/man/xmlsec1-config.1
+++ b/man/xmlsec1-config.1
@@ -1,34 +1,46 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.4.
-.TH XMLSEC1-CONFIG "1" "March 2013" "xmlsec1-config 1.2.19" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.2.
+.TH XMLSEC1-CONFIG "1" "February 2016" "xmlsec1-config 1.2.20" "User Commands"
 .SH NAME
 xmlsec1-config \- detail installed version of xmlsec library
 .SH SYNOPSIS
 .B xmlsec1-config
-[\fIOPTION\fR]...
+[\fI\,OPTION\/\fR]...
 .SH DESCRIPTION
 Known values for OPTION are:
 .TP
-\fB\-\-prefix\fR=\fIDIR\fR
-change XMLSEC prefix
-.TP
-\fB\-\-exec\-prefix\fR=\fIDIR\fR
-change XMLSEC executable prefix
+\fB\-\-cflags\fR
+print pre\-processor and compiler flags
 .TP
 \fB\-\-libs\fR
 print library linking information
 .TP
-\fB\-\-cflags\fR
-print pre\-processor and compiler flags
+\fB\-\-prefix\fR
+print the default XMLSEC prefix folder
+.TP
+\fB\-\-exec\-prefix\fR
+print the default XMLSEC executable prefix folder
+.TP
+\fB\-\-libdir\fR
+print the default XMLSEC libraries folder
 .TP
 \fB\-\-crypto\fR
 print the default crypto library name
 .TP
+\fB\-\-prefix\fR=\fI\,DIR\/\fR
+change XMLSEC prefix folder
+.TP
+\fB\-\-exec\-prefix\fR=\fI\,DIR\/\fR
+change XMLSEC executable prefix folder
+.TP
+\fB\-\-libdir\fR=\fI\,DIR\/\fR
+change XMLSEC libraries folder
+.TP
+\fB\-\-crypto\fR=\fI\,LIB\/\fR
+configure with XMLSEC crypto library (one of the
+following: none default openssl nss gnutls gcrypt)
+.TP
 \fB\-\-help\fR
 display this help and exit
 .TP
 \fB\-\-version\fR
 output version information
-.TP
-\fB\-\-crypto\fR=\fILIB\fR
-configure with XMLSEC crypto library (one of the
-following: none default openssl nss gnutls gcrypt)
diff --git a/man/xmlsec1.1 b/man/xmlsec1.1
index 37fc834f..0baebed1 100644
--- a/man/xmlsec1.1
+++ b/man/xmlsec1.1
@@ -1,10 +1,10 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.4.
-.TH XMLSEC1 "1" "March 2013" "xmlsec1 1.2.19 (openssl)" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.2.
+.TH XMLSEC1 "1" "February 2016" "xmlsec1 1.2.20 (openssl)" "User Commands"
 .SH NAME
 xmlsec1 \- sign, verify, encrypt and decrypt XML documents
 .SH SYNOPSIS
 .B xmlsec
-\fI<command> \fR[\fI<options>\fR] [\fI<files>\fR]
+\fI\,<command> \/\fR[\fI\,<options>\/\fR] [\fI\,<files>\/\fR]
 .SH DESCRIPTION
 xmlsec is a command line tool for signing, verifying, encrypting and
 decrypting XML documents. The allowed <command> values are:
@@ -264,6 +264,6 @@ Written by Aleksey Sanin <aleksey@aleksey.com>.
 .SH "REPORTING BUGS"
 Report bugs to http://www.aleksey.com/xmlsec/bugs.html
 .SH COPYRIGHT
-Copyright \(co 2002\-2003 Aleksey Sanin.
+Copyright \(co 2002\-2016 Aleksey Sanin <aleksey@aleksey.com>. All Rights Reserved..
 .br
 This is free software: see the source for copying information.