diff options
| author | Ralf Wildenhues <Ralf.Wildenhues@gmx.de> | 2008-09-22 22:32:08 +0200 |
|---|---|---|
| committer | Jim Meyering <meyering@redhat.com> | 2008-09-22 22:42:20 +0200 |
| commit | beaee48f269f6e7a38be8dfb032e6e88c0a4bf5f (patch) | |
| tree | a1216c57aa6cd239b52e4221df7349c84f5a6664 /src | |
| parent | 2643b4b77dbc5504e1b95b4abebccdf874638dc1 (diff) | |
| download | coreutils-beaee48f269f6e7a38be8dfb032e6e88c0a4bf5f.tar.xz | |
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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 7 |
1 files changed, 5 insertions, 2 deletions
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) |