From 282c0e4790396673b7b9c9c44dd58ad1a777bca2 Mon Sep 17 00:00:00 2001 From: Nathanael Nerode Date: Sun, 13 Jul 2003 20:49:42 +0000 Subject: * Makefile.tpl: Set INSTALL and friends using autoconf. Remove unused INSTALL_PROGRAM_ARGS. * configure.in: Use AC_PROG_INSTALL. * Makefile.in: Regenerate. * configure: Regenerate. --- Makefile.in | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) (limited to 'Makefile.in') diff --git a/Makefile.in b/Makefile.in index 4cfd9d297..1a44b4fa9 100644 --- a/Makefile.in +++ b/Makefile.in @@ -61,14 +61,10 @@ man7dir = $(mandir)/man7 man8dir = $(mandir)/man8 man9dir = $(mandir)/man9 -# INSTALL_PROGRAM_ARGS is changed by configure.in to use -x for a -# cygwin host. -INSTALL_PROGRAM_ARGS = - -INSTALL = $(SHELL) $$s/install-sh -c -INSTALL_PROGRAM = $(INSTALL) $(INSTALL_PROGRAM_ARGS) -INSTALL_SCRIPT = $(INSTALL) -INSTALL_DATA = $(INSTALL) -m 644 +INSTALL = @INSTALL@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_DATA = @INSTALL_DATA@ # ------------------------------------------------- # Miscellaneous non-standard autoconf-set variables @@ -23740,12 +23736,13 @@ gcc-no-fixedincludes: # Host modules specific to gcc. # GCC needs to identify certain tools. -configure-gcc: maybe-configure-binutils maybe-configure-gas maybe-configure-ld maybe-configure-bison maybe-configure-flex -all-gcc: maybe-all-libiberty maybe-all-bison maybe-all-byacc maybe-all-binutils maybe-all-gas maybe-all-ld maybe-all-zlib +# GCC also needs the information exported by the intl configure script. +configure-gcc: maybe-configure-intl maybe-configure-binutils maybe-configure-gas maybe-configure-ld maybe-configure-bison maybe-configure-flex +all-gcc: maybe-all-libiberty maybe-all-intl maybe-all-bison maybe-all-byacc maybe-all-binutils maybe-all-gas maybe-all-ld maybe-all-zlib # This is a slightly kludgy method of getting dependencies on # all-build-libiberty correct; it would be better to build it every time. all-gcc: maybe-all-build-libiberty -all-bootstrap: maybe-all-libiberty maybe-all-texinfo maybe-all-bison maybe-all-byacc maybe-all-binutils maybe-all-gas maybe-all-ld maybe-all-zlib +all-bootstrap: maybe-all-libiberty maybe-all-intl maybe-all-texinfo maybe-all-bison maybe-all-byacc maybe-all-binutils maybe-all-gas maybe-all-ld maybe-all-zlib # Host modules specific to gdb. # GDB needs to know that the simulator is being built. -- cgit v1.2.3