fix installation with ./ginstall in src

* src/Makefile.am (cu_install_program): New variable, set to
either ./ginstall or @INSTALL_PROGRAM@ (for cross compilation).
(INSTALL_PROGRAM): Override AC_SUBST unconditionally, to avoid
warning, and wrong initialization order.

diff --git a/src/Makefile.am b/src/Makefile.am
index 80313ae4ba3a0b670e3cc1b65d514ec54259ae9e..362587885387f1a6676f9f98176733bf9de0df6f 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -466,6 +466,9 @@ sc_tight_scope: $(all_programs)
            exit 1; } || :
 
 # Use the just-built ./ginstall, when not cross-compiling.
-if !CROSS_COMPILING
-INSTALL_PROGRAM = ./ginstall
+if CROSS_COMPILING
+cu_install_program = @INSTALL_PROGRAM@
+else
+cu_install_program = ./ginstall
 endif
+INSTALL_PROGRAM = $(cu_install_program)