From 07da4c6ec66f468deed6ebe07836a2fd3427c68d Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Wed, 21 Dec 2005 00:59:04 +0000 Subject: [PATCH] * config.make.in: * stepmake/aclocal.m4: Do not substitute INSTALL. --- ChangeLog | 7 ++++++- config.make.in | 1 - stepmake/aclocal.m4 | 1 - stepmake/stepmake/generic-vars.make | 1 - 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 46dc6f460c..794d405846 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-12-21 Jan Nieuwenhuizen + + * config.make.in: + * stepmake/aclocal.m4: Do not substitute INSTALL. + 2005-12-21 Han-Wen Nienhuys * lily/relocate.cc (setup_paths): only check path for non-absolute @@ -9,7 +14,7 @@ 2005-12-21 Jan Nieuwenhuizen * 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 bc3c1363fb..2f59f5786c 100644 --- 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 896c80a773..aede926556 100644 --- 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 f41d2b415b..2a6cf327a7 100644 --- 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)/.. -- 2.39.2