Merge branch 'master' of chrysocolla.lwithers.me.uk:git/lw-build-system
This commit is contained in:
commit
87e377dc4b
|
@ -6,7 +6,7 @@ cgi) DEST_BINDIR="CGIDIR" ;;
|
||||||
echo "One argument required: binary location (bin, sbin or cgi)."
|
echo "One argument required: binary location (bin, sbin or cgi)."
|
||||||
exit 1
|
exit 1
|
||||||
;;
|
;;
|
||||||
fi
|
esac
|
||||||
|
|
||||||
do_parameter_subst DEST_BINDIR
|
do_parameter_subst DEST_BINDIR
|
||||||
true
|
true
|
||||||
|
|
|
@ -1,5 +1,3 @@
|
||||||
build_target @NAME@
|
|
||||||
|
|
||||||
echo "Building @NAME@ (via Makefile)"
|
echo "Building @NAME@ (via Makefile)"
|
||||||
export MAKE_OBJDIR="$(pwd)/obj/@NAME@"
|
export MAKE_OBJDIR="$(pwd)/obj/@NAME@"
|
||||||
mkdir -p "${MAKE_OBJDIR}"
|
mkdir -p "${MAKE_OBJDIR}"
|
||||||
|
|
|
@ -70,8 +70,6 @@ case "${PREFIX}" in
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
MY_CGIDIR="${WEBDIR}/cgi-bin"
|
|
||||||
|
|
||||||
# assign paths allowing user to override
|
# assign paths allowing user to override
|
||||||
[ -z "${BINDIR}" ] && BINDIR="${MY_BINDIR}"
|
[ -z "${BINDIR}" ] && BINDIR="${MY_BINDIR}"
|
||||||
[ -z "${SBINDIR}" ] && SBINDIR="${MY_SBINDIR}"
|
[ -z "${SBINDIR}" ] && SBINDIR="${MY_SBINDIR}"
|
||||||
|
@ -81,7 +79,7 @@ MY_CGIDIR="${WEBDIR}/cgi-bin"
|
||||||
[ -z "${VARDIR}" ] && VARDIR="${MY_VARDIR}"
|
[ -z "${VARDIR}" ] && VARDIR="${MY_VARDIR}"
|
||||||
[ -z "${DOCSDIR}" ] && DOCSDIR="${MY_DOCSDIR}"
|
[ -z "${DOCSDIR}" ] && DOCSDIR="${MY_DOCSDIR}"
|
||||||
[ -z "${WEBDIR}" ] && WEBDIR="${MY_WEBDIR}"
|
[ -z "${WEBDIR}" ] && WEBDIR="${MY_WEBDIR}"
|
||||||
[ -z "${CGIDIR}" ] && CGIDIR="${MY_CGIDIR}"
|
[ -z "${CGIDIR}" ] && CGIDIR="${WEBDIR}/cgi-bin"
|
||||||
|
|
||||||
# kate: @KATE_MODELINE@
|
# kate: @KATE_MODELINE@
|
||||||
# vim: syntax=sh:@VIM_MODELINE@
|
# vim: syntax=sh:@VIM_MODELINE@
|
||||||
|
|
Loading…
Reference in New Issue