rdelaage
/
gmid
mirror of https://github.com/omar-polo/gmid.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix INSTALL handling 

Set a sane default for INSTALL, allow it to be changed either as
environment variable or configure argument, and propagate it correctly
to the generated config.mk.

Issue reported by xavi, thanks!
This commit is contained in:
Omar Polo 2023-08-13 09:53:12 +00:00
parent 81634643db
commit f5dc7eddd7
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
configure vendored
View File

@ -48,6 +48,7 @@ else
CFLAGS=${CFLAGS:--O2 -pipe} CFLAGS=${CFLAGS:--O2 -pipe}
fi fi
INSTALL=${INSTALL-install}
PREFIX=${PREFIX-/usr/local} PREFIX=${PREFIX-/usr/local}
CDIAGFLAGS= CDIAGFLAGS=
@ -102,6 +103,7 @@ while [ $# -gt 0 ]; do
CFLAGS) CFLAGS="$val" ;; CFLAGS) CFLAGS="$val" ;;
CDIAGFLAGS) CDIAGFLAGS="$val" ;; CDIAGFLAGS) CDIAGFLAGS="$val" ;;
DISABLE_SANDBOX) DISABLE_SANDBOX="$val" ;; DISABLE_SANDBOX) DISABLE_SANDBOX="$val" ;;
INSTALL) INSTALL="$val" ;;
LDFLAGS) LDFLAGS="$val" ;; LDFLAGS) LDFLAGS="$val" ;;
PKG_CONFIG) PKG_CONFIG="$val" ;; PKG_CONFIG) PKG_CONFIG="$val" ;;
PREFIX) PREFIX="$val" ;; PREFIX) PREFIX="$val" ;;
@ -488,13 +490,8 @@ echo "file config.h: written" 1>&3
exec > config.mk exec > config.mk
[ -z "${BINDIR}" ] && BINDIR="\${PREFIX}/bin" [ -z "${BINDIR}" ] && BINDIR="\${PREFIX}/bin"
[ -z "${MANDIR}" ] && MANDIR="\${PREFIX}/man" [ -z "${MANDIR}" ] && MANDIR="\${PREFIX}/man"
[ -z "${INSTALL_PROGRAM}" ] && INSTALL_PROGRAM="${INSTALL} -m 0555"
[ -z "${INSTALL_LIB}" ] && INSTALL_LIB="${INSTALL} -m 0444"
[ -z "${INSTALL_MAN}" ] && INSTALL_MAN="${INSTALL} -m 0444"
[ -z "${INSTALL_DATA}" ] && INSTALL_DATA="${INSTALL} -m 0444"
cat << __HEREDOC__ cat << __HEREDOC__
CC = ${CC} CC = ${CC}
@ -507,11 +504,11 @@ PREFIX = ${PREFIX}
BINDIR = ${BINDIR} BINDIR = ${BINDIR}
MANDIR = ${MANDIR} MANDIR = ${MANDIR}
INSTALL = install INSTALL = ${INSTALL}
INSTALL_PROGRAM = ${INSTALL} -m 0555 INSTALL_PROGRAM = \${INSTALL} -m 0555
INSTALL_LIB = ${INSTALL} -m 0444 INSTALL_LIB = \${INSTALL} -m 0444
INSTALL_MAN = ${INSTALL} -m 0444 INSTALL_MAN = \${INSTALL} -m 0444
INSTALL_DATA = ${INSTALL} -m 0444 INSTALL_DATA = \${INSTALL} -m 0444
COMPATS= ${COMPATS} COMPATS= ${COMPATS}