diff options
author | P. J. McDermott <pjm@nac.net> | 2012-01-19 20:43:31 (EST) |
---|---|---|
committer | P. J. McDermott <pjm@nac.net> | 2012-01-19 20:43:31 (EST) |
commit | 8ff365db634e1e848439ad4567b7824972abbd33 (patch) | |
tree | c3f50264a93e6733e5775d33962205f4c4d7b076 | |
parent | 0728ed3752577012b8f4a8302aa23c5c63cfa2f9 (diff) |
Fix BINDIR in configure.
-rwxr-xr-x | configure | 16 |
1 files changed, 8 insertions, 8 deletions
@@ -44,8 +44,8 @@ Configuration: Installation directories: --prefix=PREFIX install files under PREFIX default: /usr/local - --sbindir=SBINDIR install scripts in SBINDIR - default: PREFIX/sbin + --bindir=BINDIR install scripts in BINDIR + default: PREFIX/bin EOF } @@ -91,9 +91,9 @@ while true; do PREFIX="${2}" shift 2 ;; - --sbindir) + --bindir) # Leave PREFIX unexpanded for now, in case it isn't set yet. - SBINDIR="\${PREFIX}/${2}" + BINDIR="\${PREFIX}/${2}" shift 2 ;; --) @@ -117,11 +117,11 @@ fi if [ -z "${PREFIX}" ]; then PREFIX=/usr/local fi -if [ -z "${SBINDIR}" ]; then - SBINDIR=${PREFIX}/sbin +if [ -z "${BINDIR}" ]; then + BINDIR=${PREFIX}/sbin fi # Expand PREFIX if it's there. -eval "SBINDIR=${SBINDIR}" +eval "BINDIR=${BINDIR}" find_dependency() { @@ -161,7 +161,7 @@ s&@shell@&${SHELL}& s&@install@&${INSTALL} -c& s&@srcdir@&${SRCDIR}& s&@prefix@&${PREFIX}& -s&@sbindir@&${SBINDIR}&" +s&@bindir@&${BINDIR}&" # Replace configuration variables in Makefile.in sed "$sed_script" ${SRCDIR}/Makefile.in > Makefile |