summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorP. J. McDermott <pjm@nac.net>2012-11-07 20:00:42 (EST)
committer P. J. McDermott <pjm@nac.net>2012-11-07 20:00:42 (EST)
commitbcc1d7910f668b76c53606df892b27b39522fdaa (patch)
tree92c60a8e7d6b1b37b179222ba4c406790f4985da /configure
parente77b32854807af6ce6b532996380d2a6a09d1ba3 (diff)
parent02ff44fe4d963f290347568833846b7d8b5db854 (diff)
Merge branch 'feature/build-sys-arches'.
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure23
1 files changed, 15 insertions, 8 deletions
diff --git a/configure b/configure
index f39846a..4427908 100755
--- a/configure
+++ b/configure
@@ -25,20 +25,22 @@ package_description='OPK Build Helper Tools'
srcdir="$(cd "${0%/*}" && pwd)"
prefix='/usr/local'
-bindir='$(prefix)/bin'
-libdir='$(prefix)/share'
-datadir='$(prefix)/share'
-mandir='$(datadir)/man'
-localedir='$(datadir)/locale'
-libopkhelper='$(libdir)/libopkhelper.3.0'
+bindir='${prefix}/bin'
+libdir='${prefix}/share'
+datadir='${prefix}/share'
+mandir='${datadir}/man'
+localedir='${datadir}/locale'
+libopkhelper='${libdir}/libopkhelper.3.0'
quiet='false'
missing_deps='false'
dep_cmds='
sh
+make
'
dep_libs='
libopkbuild.1
+archtab
'
long_opts_with_args='
@@ -158,6 +160,7 @@ Dependencies:
--with-sh=PATH use sh at PATH
--with-libopkbuild.1=PATH
use libopkbuild.1 at PATH
+ --with-archtab=PATH use archtab at PATH
EOF
}
@@ -286,10 +289,10 @@ find_dep_lib()
IFS=':'
- for _element in ${libdir}:${PATH}; do
+ for _element in $(eval echo "${libdir}") ${PATH}; do
unset IFS
: ${_element=-.}
- if [ -f "${_element}/${_dep}" -a -x "${_element}/${_dep}" ]; then
+ if [ -d "${_element}/${_dep}" ]; then
${quiet} || printf '%s/%s\n' "${_element}" "${_dep}"
eval "${_dep}"=\"${_element}/${_dep}\"
return 0
@@ -315,6 +318,10 @@ write_makefiles()
mkdir -p "${_dir}"
sed "${_sed_script}" "${srcdir}/${_dir}/Makefile.in" >"${_dir}/Makefile"
done
+
+ # New and improved kludge to generate an architecture table for testing.
+ # TODO: Remove when no longer used.
+ sed "${_sed_script}" "${srcdir}/mkarchtab.in" >'mkarchtab'
}
main "${@}"