[git] GPG-ERROR - branch, master, updated. gpgrt-1.28-10-g4dc6d4d

[by NIIBE Yutaka]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Error codes used by GnuPG et al.".

The branch, master has been updated
       via  4dc6d4d2067c726cdb13593bf151637319ff65e6 (commit)
      from  5b963d2f954bd978f69e391155cb9b337936ba75 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 4dc6d4d2067c726cdb13593bf151637319ff65e6
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Thu Mar 22 11:15:15 2018 +0900

    doc: Fix build and installation of yat2m.
    
    * configure.ac (YAT2M): Require it when cross compiling.
    * doc/Makefile.am (bin_PROGRAMS): Add yat2m.
    
    --
    
    Before 1.28, yat2m used to be an internal tool.  Now, it's a standard
    tool.  For native build, it is built and used for initial
    installation.  For cross build, it is required on the build system.
    
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>

diff --git a/configure.ac b/configure.ac
index 12abb48..8d11998 100644
--- a/configure.ac
+++ b/configure.ac
@@ -80,6 +80,7 @@ AM_PROG_CC_C_O
 AC_PROG_CPP
 AC_PROG_AWK
 AC_CHECK_TOOL(AR, ar, :)
+AC_ARG_VAR(YAT2M, [tool to convert texi to man pages])
 AC_GNU_SOURCE
 
 # Set some variables depending on the platform for later use.
@@ -138,6 +139,13 @@ fi
 AC_MSG_RESULT($CC_FOR_BUILD)
 AC_ARG_VAR(CC_FOR_BUILD,[build system C compiler])
 
+AC_PATH_PROG(YAT2M, yat2m, ./yat2m)
+if test "$cross_compiling" = "yes" -a ac_cv_path_YAT2M = "./yat2m"; then
+   AC_MSG_ERROR([[
+***
+*** yat2m is not installed on this build system.  Please install.
+***]])
+fi
 
 AH_BOTTOM([
 /* Force using of NLS for W32 even if no libintl has been found.  This is
diff --git a/doc/Makefile.am b/doc/Makefile.am
index d052283..328089a 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -17,11 +17,14 @@
 # License along with this program; if not, see <https://www.gnu.org/licenses/>.
 
 
-EXTRA_DIST = HACKING errorref.txt \
-	     yat2m.c
+EXTRA_DIST = HACKING errorref.txt
+
+bin_PROGRAMS = yat2m
+yat2m_SOURCES = yat2m.c
+yat2m_CFLAGS= -DPACKAGE_VERSION="\"$(PACKAGE_VERSION)\""
 
 DISTCLEANFILES = gpgrt.cps yat2m-stamp.tmp yat2m-stamp $(myman_pages)
-CLEANFILES = yat2m errorref.txt.x
+CLEANFILES = errorref.txt.x
 
 info_TEXINFOS = gpgrt.texi
 gpgrt_TEXINFOS = lgpl.texi gpl.texi
@@ -34,20 +37,15 @@ myman_pages   = gpg-error-config.1
 
 man_MANS = $(myman_pages)
 
-yat2m: yat2m.c
-	$(CC_FOR_BUILD) -DPACKAGE_VERSION="\"$(PACKAGE_VERSION)\"" \
-                -o $@ $(srcdir)/yat2m.c
-
-
 yat2m-stamp: $(myman_sources)
 	@rm -f yat2m-stamp.tmp
 	@touch yat2m-stamp.tmp
 	for file in $(myman_sources) ; do \
-              ./yat2m $(YAT2M_OPTIONS) --store \
+              $(YAT2M) $(YAT2M_OPTIONS) --store \
 	          `test -f '$$file' || echo '$(srcdir)/'`$$file ; done
 	@mv -f yat2m-stamp.tmp $@
 
-yat2m-stamp: yat2m
+yat2m-stamp: $(YAT2M)
 
 $(myman_pages) : yat2m-stamp
 	@if test -f $@; then :; else \
@@ -72,22 +70,9 @@ errorref.txt.x : errorref.txt
 	sed '/^##/ d' $< >$@
 	echo "# Installed by $(PACKAGE_NAME) $(PACKAGE_VERSION)" >>$@
 
-install-exec-hook:
-if CROSS_COMPILING
-	@echo "not install yat2m while cross-compiling"
-else
-	@echo "installing yat2m on the build system"; \
-         $(MKDIR_P) "$(DESTDIR)$(bindir)"; \
-	 $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) \
-	         yat2m "$(DESTDIR)$(bindir)/yat2m"
-endif
-
 install-data-local: errorref.txt.x
 	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
 	$(INSTALL_DATA) errorref.txt.x $(DESTDIR)$(pkgdatadir)/errorref.txt
 
 uninstall-local:
 	- at rm $(DESTDIR)$(pkgdatadir)/errorref.txt
-if !CROSS_COMPILING
-	- at rm $(DESTDIR)$(bindir)/yat2m
-endif

-----------------------------------------------------------------------

Summary of changes:
 configure.ac    |  8 ++++++++
 doc/Makefile.am | 31 ++++++++-----------------------
 2 files changed, 16 insertions(+), 23 deletions(-)


hooks/post-receive
-- 
Error codes used by GnuPG et al.
http://git.gnupg.org