install with just-built ./ginstall only when not cross-compiling

* src/Makefile.am (install-exec-am): ...otherwise, use the default
value, $(INSTALL_PROGRAM).  Reported by Brian Silverman.

diff --git a/THANKS b/THANKS
index 40b33bada6521b02ba993f2cfa8986c66316f68c..bff091755cc3528a67577c2fa860e1ceb4d2295f 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -79,6 +79,7 @@ Bob Proulx                          rwp@fc.hp.com
 Branden Robinson                    branden@necrotic.deadbeast.net
 Brendan O'Dea                       bod@compusol.com.au
 Brian Kimball                       bfk@footbag.org
+Brian Silverman                     bsilverman@conceptxdesign.com
 Brian Youmans                       3diff@gnu.org
 Bruce Korb                          bkorb@veritas.com
 Bruce Robertson                     brucer@theodolite.dyndns.org

diff --git a/src/Makefile.am b/src/Makefile.am
index 342fc0964743b072f3c73f88bff07b63a20785f6..65b20a2a3078f8abff263564da7f6a641bd3a4f2 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -437,11 +437,15 @@ sc_tight_scope: $(all_programs)
          { echo 'the above variables should have static scope' 1>&2;   \
            exit 1; } || :
 
-.PHONY: cu-install-binPROGRAMS
+# Use the just-built ./ginstall, when not cross-compiling.
+# Override automake's install-one-at-a-time rule, when possible.
 install-exec-am:
-       @case '$(program_transform_name):$(EXEEXT)' in          \
+       @(./ginstall --version) > /dev/null 2>&1                \
+         && install=./ginstall                                 \
+         || install='$(INSTALL_PROGRAM)';                      \
+       case '$(program_transform_name):$(EXEEXT)' in           \
          's,x,x,:') cu=cu-;; *) cu= ;; esac;                   \
-       $(MAKE) $(AM_MAKEFLAGS) binPROGRAMS_INSTALL=./ginstall  \
+       $(MAKE) $(AM_MAKEFLAGS) binPROGRAMS_INSTALL="$$install" \
          $${cu}install-binPROGRAMS
        @$(NORMAL_INSTALL)
        $(MAKE) $(AM_MAKEFLAGS) install-exec-hook
@@ -458,6 +462,7 @@ install-exec-am:
 filtered_PROGS = \
   `echo "$(bin_PROGRAMS)" | sed 's/ *\<ginstall\> */ /;s/ *\[ */ /'`
 d_bindir = $(DESTDIR)$(bindir)
+.PHONY: cu-install-binPROGRAMS
 cu-install-binPROGRAMS: $(bin_PROGRAMS)
        $(NORMAL_INSTALL)
        test -z "$(bindir)" || $(MKDIR_P) "$(d_bindir)"