aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configure.ac2
m---------contrib/wallet-core0
-rw-r--r--doc/Makefile.am10
m---------doc/prebuilt0
4 files changed, 11 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index 3cfa0d57..0bd5bf58 100644
--- a/configure.ac
+++ b/configure.ac
@@ -212,7 +212,7 @@ AC_CHECK_HEADERS([gnunet/gnunet_util_lib.h],
AS_IF([test $libgnunetutil != 1],
[AC_MSG_ERROR([[
***
-*** You need libgnunetutil >= 0.20.0 to build this program.
+*** You need libgnunetutil >= 0.21.0 to build this program.
*** This library is part of GNUnet, available at
*** https://gnunet.org
*** ]])])
diff --git a/contrib/wallet-core b/contrib/wallet-core
-Subproject 286b4a1ade68c0cc0dfbb2ff876364538020fd0
+Subproject c0f3069970e24d1fa9e308347350d6e5221aed8
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 78106516..9efaf49d 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -15,6 +15,16 @@ info_TEXINFOS = \
prebuilt/texinfo/taler-merchant-api-tutorial.texi \
prebuilt/texinfo/taler-merchant.texi
+install-info-local:
+ @echo " $(MKDIR_P) '$(DESTDIR)$(infodir)/taler-merchant-api-tutorial-figures'"; \
+ $(MKDIR_P) "$(DESTDIR)$(infodir)/taler-merchant-api-tutorial-figures" || exit 1; \
+ @echo " $(MKDIR_P) '$(DESTDIR)$(infodir)/taler-merchant-figures'"; \
+ $(MKDIR_P) "$(DESTDIR)$(infodir)/taler-merchant-figures" || exit 1; \
+ echo " $(INSTALL_DATA) arch-api.png '$(DESTDIR)$(infodir)/taler-merchant-api-tutorial-figures'"; \
+ $(INSTALL_DATA) '$(srcdir)/prebuilt/texinfo/taler-merchant-api-tutorial-figures/arch-api.png' "$(DESTDIR)$(infodir)/taler-merchant-api-tutorial-figures" || exit 1;
+ echo " $(INSTALL_DATA) prebuilt/texinfo/taler-merchant-figures/*.png '$(DESTDIR)$(infodir)/taler-merchant-figures'"; \
+ $(INSTALL_DATA) '$(srcdir)/prebuilt/texinfo/taler-merchant-figures/arch-api.png' '$(srcdir)/prebuilt/texinfo/taler-merchant-figures/merchant_first_login.png' '$(srcdir)/prebuilt/texinfo/taler-merchant-figures/no_default_account_yet.png' '$(srcdir)/prebuilt/texinfo/taler-merchant-figures/enter_instance_details.png' '$(srcdir)/prebuilt/texinfo/taler-merchant-figures/instance_iban_config.png' '$(srcdir)/prebuilt/texinfo/taler-merchant-figures/create_orders.png' '$(srcdir)/prebuilt/texinfo/taler-merchant-figures/payment_links.png' '$(srcdir)/prebuilt/texinfo/taler-merchant-figures/merchant-db.png' "$(DESTDIR)$(infodir)/taler-merchant-figures" || exit 1;
+
EXTRA_DIST = \
$(man_MANS) \
diff --git a/doc/prebuilt b/doc/prebuilt
-Subproject cc7826233a726fa2a4faae47731309198ef7944
+Subproject 76a0b43311a1dae141e6b903e9d465da3be19ae