[top level] autoconfiscate INSTALL usage

Nathanael Nerode
2003-07-12T02:40:34Z

Submitting for general consideration. Plus, it affects a bug. Tested
on i686-pc-linux-gnu.

PR bootstrap/11408
* Makefile.tpl: Set INSTALL and friends using autoconf. Remove
unused INSTALL_PROGRAM_ARGS.
* configure.in: Use AC_PROG_INSTALL.
* Makefile.in: Regenerate.
* configure: Regenerate.

Index: Makefile.tpl
===================================================================
RCS file: /cvs/gcc/gcc/Makefile.tpl,v
retrieving revision 1.65
diff -u -r1.65 Makefile.tpl
--- Makefile.tpl 8 Jul 2003 05:54:54 -0000 1.65
+++ Makefile.tpl 11 Jul 2003 04:56:20 -0000
@@ -64,14 +64,10 @@
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
Index: configure.in
===================================================================
RCS file: /cvs/gcc/gcc/configure.in,v
retrieving revision 1.243
diff -u -r1.243 configure.in
--- configure.in 27 Jun 2003 17:33:51 -0000 1.243
+++ configure.in 11 Jul 2003 04:56:24 -0000
@@ -23,6 +23,9 @@
AC_CANONICAL_SYSTEM
AC_ARG_PROGRAM

+# Get 'install' or 'install-sh' and its variants.
+AC_PROG_INSTALL
+
sinclude(config/acx.m4)

### we might need to use some other shell than /bin/sh for running subshells

--
Nathanael Nerode <neroden at gcc.gnu.org>