ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

configure: Don't allow overriding INSTALL.

Browse Source
This commit is contained in:
Alexandre Julliard 2014-01-04 19:35:00 +01:00
parent ce25c89585
commit 205003f9c0
3 changed files with 3 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Make.vars.in
View File

@ -70,10 +70,9 @@ CROSSWINEGCC = $(TOOLSDIR)/tools/winegcc/winegcc -B$(TOOLSDIR)/tools/winebuil
SED_CMD = LC_ALL=C sed -e 's,@bindir\@,$(bindir),g' -e 's,@dlldir\@,$(dlldir),g' -e 's,@PACKAGE_STRING\@,@PACKAGE_STRING@,g' -e 's,@PACKAGE_VERSION\@,@PACKAGE_VERSION@,g' SED_CMD = LC_ALL=C sed -e 's,@bindir\@,$(bindir),g' -e 's,@dlldir\@,$(dlldir),g' -e 's,@PACKAGE_STRING\@,@PACKAGE_STRING@,g' -e 's,@PACKAGE_VERSION\@,@PACKAGE_VERSION@,g'
LDRPATH_INSTALL = @LDRPATH_INSTALL@ LDRPATH_INSTALL = @LDRPATH_INSTALL@
LDRPATH_LOCAL = @LDRPATH_LOCAL@ LDRPATH_LOCAL = @LDRPATH_LOCAL@
INSTALL = @INSTALL@ $(INSTALL_FLAGS) INSTALL_PROGRAM = STRIPPROG="$(STRIP)" $(top_srcdir)/tools/install-sh $(INSTALL_PROGRAM_FLAGS)
INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(INSTALL_PROGRAM_FLAGS) INSTALL_SCRIPT = $(top_srcdir)/tools/install-sh $(INSTALL_SCRIPT_FLAGS)
INSTALL_SCRIPT = @INSTALL_SCRIPT@ $(INSTALL_SCRIPT_FLAGS) INSTALL_DATA = $(top_srcdir)/tools/install-sh -m 644 $(INSTALL_DATA_FLAGS)
INSTALL_DATA = @INSTALL_DATA@ $(INSTALL_DATA_FLAGS)
CLEAN_FILES = *.o *.a *.so *.res *.fake *.ok *.tab.[ch] *.yy.c CLEAN_FILES = *.o *.a *.so *.res *.fake *.ok *.tab.[ch] *.yy.c
prog_manext = 1 prog_manext = 1
api_manext = 3w api_manext = 3w

14
configure vendored
View File

@ -719,10 +719,6 @@ RSVG
FONTFORGE FONTFORGE
PKG_CONFIG PKG_CONFIG
MSGFMT MSGFMT
INSTALL_DATA
INSTALL_SCRIPT
INSTALL_PROGRAM
INSTALL
LDCONFIG LDCONFIG
MKDIR_P MKDIR_P
EGREP EGREP
@ -5443,16 +5439,6 @@ $as_echo "no" >&6; }
fi 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 for ac_prog in msgfmt
do do
# Extract the first word of "$ac_prog", so it can be a program name with args. # Extract the first word of "$ac_prog", so it can be a program name with args.

7
configure.ac
View File

@ -266,13 +266,6 @@ AC_PROG_LN_S
AC_PROG_EGREP AC_PROG_EGREP
AC_PROG_MKDIR_P AC_PROG_MKDIR_P
AC_PATH_PROG(LDCONFIG, ldconfig, true, [/sbin /usr/sbin $PATH]) 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) AC_CHECK_PROGS(MSGFMT, msgfmt, false)
WINE_PATH_PKG_CONFIG WINE_PATH_PKG_CONFIG