Alexandre Julliard : configure: Don't allow overriding INSTALL.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 205003f9c09b49e56f4f9df15fe53492d0d8bd7b
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=205003f9c09b49e56f4f9df15fe53492d0d8bd7b

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Sat Jan  4 19:35:00 2014 +0100

configure: Don't allow overriding INSTALL.

---

 Make.vars.in |    7 +++----
 configure    |   14 --------------
 configure.ac |    7 -------
 3 files changed, 3 insertions(+), 25 deletions(-)

diff --git a/Make.vars.in b/Make.vars.in
index 15ef9c0..6bec6979 100644
--- a/Make.vars.in
+++ b/Make.vars.in
@@ -70,10 +70,9 @@ CROSSWINEGCC    = $(TOOLSDIR)/tools/winegcc/winegcc -B$(TOOLSDIR)/tools/winebuil
 SED_CMD         = LC_ALL=C sed -e 's, at bindir\@,$(bindir),g' -e 's, at dlldir\@,$(dlldir),g' -e 's, at PACKAGE_STRING\@, at PACKAGE_STRING@,g' -e 's, at PACKAGE_VERSION\@, at PACKAGE_VERSION@,g'
 LDRPATH_INSTALL = @LDRPATH_INSTALL@
 LDRPATH_LOCAL   = @LDRPATH_LOCAL@
-INSTALL         = @INSTALL@ $(INSTALL_FLAGS)
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(INSTALL_PROGRAM_FLAGS)
-INSTALL_SCRIPT  = @INSTALL_SCRIPT@ $(INSTALL_SCRIPT_FLAGS)
-INSTALL_DATA    = @INSTALL_DATA@ $(INSTALL_DATA_FLAGS)
+INSTALL_PROGRAM = STRIPPROG="$(STRIP)" $(top_srcdir)/tools/install-sh $(INSTALL_PROGRAM_FLAGS)
+INSTALL_SCRIPT  = $(top_srcdir)/tools/install-sh $(INSTALL_SCRIPT_FLAGS)
+INSTALL_DATA    = $(top_srcdir)/tools/install-sh -m 644 $(INSTALL_DATA_FLAGS)
 CLEAN_FILES     = *.o *.a *.so *.res *.fake *.ok *.tab.[ch] *.yy.c
 prog_manext     = 1
 api_manext      = 3w
diff --git a/configure b/configure
index b4dfb47..4603d95 100755
--- a/configure
+++ b/configure
@@ -719,10 +719,6 @@ RSVG
 FONTFORGE
 PKG_CONFIG
 MSGFMT
-INSTALL_DATA
-INSTALL_SCRIPT
-INSTALL_PROGRAM
-INSTALL
 LDCONFIG
 MKDIR_P
 EGREP
@@ -5443,16 +5439,6 @@ $as_echo "no" >&6; }
 fi
 
 
-
-test -z "$INSTALL" && INSTALL="\$(top_srcdir)/tools/install-sh"
-
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM="STRIPPROG=\"\$(STRIP)\" \$(INSTALL)"
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT="\$(INSTALL)"
-
-test -z "$INSTALL_DATA" && INSTALL_DATA="\$(INSTALL) -m 644"
-
-
 for ac_prog in msgfmt
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
diff --git a/configure.ac b/configure.ac
index 3c1101c..eb780fa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -266,13 +266,6 @@ AC_PROG_LN_S
 AC_PROG_EGREP
 AC_PROG_MKDIR_P
 AC_PATH_PROG(LDCONFIG, ldconfig, true, [/sbin /usr/sbin $PATH])
-
-dnl Use the correct strip to install programs
-test -z "$INSTALL" && AC_SUBST([INSTALL],"\$(top_srcdir)/tools/install-sh")
-test -z "$INSTALL_PROGRAM" && AC_SUBST([INSTALL_PROGRAM],"STRIPPROG=\"\$(STRIP)\" \$(INSTALL)")
-test -z "$INSTALL_SCRIPT" && AC_SUBST([INSTALL_SCRIPT],"\$(INSTALL)")
-test -z "$INSTALL_DATA" && AC_SUBST([INSTALL_DATA],"\$(INSTALL) -m 644")
-
 AC_CHECK_PROGS(MSGFMT, msgfmt, false)
 WINE_PATH_PKG_CONFIG