From beaee48f269f6e7a38be8dfb032e6e88c0a4bf5f Mon Sep 17 00:00:00 2001
From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Mon, 22 Sep 2008 22:32:08 +0200
Subject: 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.
---
 src/Makefile.am | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/Makefile.am b/src/Makefile.am
index 80313ae4b..362587885 100644
--- 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)
-- 
cgit v1.2.3-54-g00ecf