1.1 --- a/configure Wed Aug 17 22:23:21 2011 +0200
1.2 +++ b/configure Wed Aug 17 23:05:01 2011 +0200
1.3 @@ -11,6 +11,7 @@
1.4 LIBDIR_set=
1.5 DOCDIR_set=
1.6 MANDIR_set=
1.7 +PROG_PFX=
1.8 LOCAL_set=
1.9 FORCE=
1.10
1.11 @@ -60,6 +61,9 @@
1.12 MANDIR_set=1
1.13 MANDIR="$( get_optval "$1" "$2" )"
1.14 }
1.15 +set_program_prefix() {
1.16 + PROG_PFX="$( get_optval "$1" "$2" )"
1.17 +}
1.18 set_tool() {
1.19 local var_name="${1%%=*}"
1.20 var_name="${var_name#--with-}"
1.21 @@ -330,7 +334,6 @@
1.22
1.23 Program names:
1.24 --program-prefix=PREFIX prepend PREFIX to installed program names
1.25 - (ignored)
1.26
1.27 System types:
1.28 --build=BUILD configure for building on BUILD [guessed] (ignored)
1.29 @@ -362,14 +365,15 @@
1.30 --docdir*) set_docdir "$1" "$2" && shift || shift 2;;
1.31 --mandir*) set_mandir "$1" "$2" && shift || shift 2;;
1.32 --with-*) set_tool "$1" "$2" && shift || shift 2;;
1.33 + --program-prefix=*|--program-prefix)
1.34 + set_program_prefix "$1" "$2" && shift || shift 2
1.35 + ;;
1.36 --force) FORCE=1; shift;;
1.37 --help|-h) do_help; exit 0;;
1.38 # Skip, auto-stuff compatibility
1.39 --build=*|--host=*|--infodir=*|--datadir=*|--sysconfdir=*|--localstatedir=*) shift;;
1.40 --build|--host|--infodir|--datadir|--sysconfdir|--localstatedir) shift 2;;
1.41 --enable-shared|--disable-shared|--enable-static|--disable-static) shift;;
1.42 - --program-prefix=*) shift;;
1.43 - --program-prefix) shift 2;;
1.44 *) printf "Unrecognised option: '${1}'\n"; do_help; exit 1;;
1.45 esac
1.46 done
1.47 @@ -384,6 +388,7 @@
1.48 set_libdir "" "$( pwd )"
1.49 set_docdir "" "$( pwd )/docs"
1.50 set_mandir "" "$( pwd )/docs"
1.51 + set_program_prefix "" ""
1.52 fi
1.53
1.54 #---------------------------------------------------------------------
1.55 @@ -624,9 +629,12 @@
1.56 eval v='"${'"${var}"'}"'
1.57 case "${v}" in
1.58 /*) ;;
1.59 - *) do_error "'${var}' is not an absolute path: '${v}'"
1.60 + *) do_error "'${var}' is not an absolute path: '${v}'";;
1.61 esac
1.62 done
1.63 +case "${PROG_PFX}" in
1.64 + */*) do_error "program prefix '${PROG_PFX}' contains a '/'";;
1.65 +esac
1.66
1.67 #---------------------------------------------------------------------
1.68 # That's all, folks!
1.69 @@ -644,6 +652,7 @@
1.70 -e "s,@@LIBDIR@@,${LIBDIR},g" \
1.71 -e "s,@@DOCDIR@@,${DOCDIR},g" \
1.72 -e "s,@@MANDIR@@,${MANDIR},g" \
1.73 + -e "s,@@PROG_PFX@@,${PROG_PFX},g" \
1.74 -e "s,@@VERSION@@,${VERSION},g" \
1.75 -e "s,@@DATE@@,${DATE},g" \
1.76 -e "s,@@LOCAL@@,${LOCAL_set},g" \
1.77 @@ -661,6 +670,7 @@
1.78 LIBDIR='${LIBDIR}'
1.79 DOCDIR='${DOCDIR}'
1.80 MANDIR='${MANDIR}'
1.81 + PROG_PFX='${PROG_PFX}'
1.82
1.83 Now run:
1.84 make