From 419801528066ea61546cde30c9f9f7f953e823b5 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Mon, 2 Nov 2009 20:33:40 -0500 Subject: It appears I'd previously edited other files, but as far as I knew a moment ago: The Makefiles have had support for DESTDIR for some time. I just realised configure didn't Which lead me to find some bugs in configure's option handling. --- configure | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'configure') diff --git a/configure b/configure index 4856815..b5209e9 100755 --- a/configure +++ b/configure @@ -17,13 +17,15 @@ name='configure' # Luke's configureation script # along with this program; see the file COPYING. # If not, see . + _DESTDIR='' _prefix='/usr/local' _exec_prefix='$(prefix)' _bindir='$(exec_prefix)/bin' _sbindir='$(exec_prefix)/sbin' _libexecdir='$(exec_prefix)/libexec' _srcdir=$(readlink -f `dirname "$0"`) -vars='prefix exec_prefix bindir sbindir libexecdir srcdir' + _CONFIG="$@" +vars='DESTDIR prefix exec_prefix bindir sbindir libexecdir srcdir CONFIG' if [ -f "$_srcdir/config" ]; then . "$_srcdir/config"; fi error() { @@ -31,9 +33,11 @@ error() { exit 1 } -args=`getopt -n "$name" -o "${sopt}" -l "${lopt}${vars}" -- "$@"` +varargs=`echo "$vars " | sed -e 's/ */:,/g' -e 's/,$//'` +args=`getopt -n "$name" -o "${sopt}" -l "${lopt}${varargs}" -- "$@"` if [ $? == 0 ]; then set -- $args + echo "$@" while [ $# -gt 0 ]; do case "$1" in --) break;; --*) @@ -46,13 +50,14 @@ if [ $? == 0 ]; then fi done if [ "$match" == 'true' ]; then - val="$2" + shift + val="$1" eval _$var0=$val else - error "option \`$1' not recognized"; + error "unrecognized option \`$1'"; fi :;; - *) error "option \`$1' not recognized";; + *) error "unrecognized option \`$1'"; esac shift done -- cgit v1.2.3-2-g168b