* config.make.in:

* stepmake/aclocal.m4: Do not substitute INSTALL.

diff --git a/ChangeLog b/ChangeLog
index 46dc6f460c26f0e3f7b67e545821a0107fc99914..794d405846a591fae33578e5bab71e8c9044f3d6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-21  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * config.make.in: 
+       * stepmake/aclocal.m4: Do not substitute INSTALL.
+
 2005-12-21  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
        * lily/relocate.cc (setup_paths): only check path for non-absolute
@@ -9,7 +14,7 @@
 2005-12-21  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * lily/relocate.cc (setup_paths) [__MINGW32__]: Comment-out broken
-       relocation code.
+       relocation code.  Oops, don't comment out too much.
 
        * stepmake/stepmake/generic-vars.make (INSTALL): Assign INSTALL_PY
        iso itself.

diff --git a/config.make.in b/config.make.in
index bc3c1363fb722ea752ed29dcc8e80e3a61c25be2..2f59f5786ca61f2dbed3959e38d380b7e90d12a7 100644 (file)
--- a/config.make.in
+++ b/config.make.in
@@ -103,7 +103,6 @@ GUILE_LDFLAGS = @GUILE_LDFLAGS@
 ICFLAGS = @ICFLAGS@
 ILDFLAGS = @ILDFLAGS@
 INIMETAFONT = @INIMETAFONT@
-INSTALL = @INSTALL@
 KPATHSEA_LIBS = @KPATHSEA_LIBS@
 LD = @LD@
 LINK_GXX_STATICALLY = @LINK_GXX_STATICALLY@

diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4
index 896c80a7733cc3b18dcfbaf78aab27b383854d97..aede92655651bc637803a55764eccd8d909f4d09 100644 (file)
--- a/stepmake/aclocal.m4
+++ b/stepmake/aclocal.m4
@@ -1252,7 +1252,6 @@ AC_DEFUN(STEPMAKE_WINDOWS, [
 
     AC_SUBST(LN)
     AC_SUBST(LN_S)
-    AC_SUBST(INSTALL)
     AC_DEFINE_UNQUOTED(DIRSEP, ['${DIRSEP}'])
     AC_DEFINE_UNQUOTED(PATHSEP, ['${PATHSEP}'])
     AC_SUBST(DIRSEP)

diff --git a/stepmake/stepmake/generic-vars.make b/stepmake/stepmake/generic-vars.make
index f41d2b415b3f2b761a8dac3e0233ac4c238282b3..2a6cf327a747b85f858db4662f7f37af3d297e6d 100644 (file)
--- a/stepmake/stepmake/generic-vars.make
+++ b/stepmake/stepmake/generic-vars.make
@@ -39,7 +39,6 @@ step-bindir = $(stepmake)/bin
 DEPTH = $(depth)/$(package-depth)
 
 INSTALLPY=$(PYTHON) $(step-bindir)/install.py -c
-## FIXME, use INSTALLPY or INSTALL from config.make?
 INSTALL=$(INSTALLPY)
 
 group-dir = $(shell cd $(DEPTH);pwd)/..