From 14a87936bd996e9f55d444fa29f41ba00fe64588 Mon Sep 17 00:00:00 2001 From: Laurence Withers Date: Thu, 22 Nov 2007 13:38:24 +0000 Subject: [PATCH 1/3] Fix syntax error in script --- scripts/build.app.sh/instantiate | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/build.app.sh/instantiate b/scripts/build.app.sh/instantiate index 2cdfb58..ab30e7b 100644 --- a/scripts/build.app.sh/instantiate +++ b/scripts/build.app.sh/instantiate @@ -6,7 +6,7 @@ cgi) DEST_BINDIR="CGIDIR" ;; echo "One argument required: binary location (bin, sbin or cgi)." exit 1 ;; -fi +esac do_parameter_subst DEST_BINDIR true From b1bb05be4a8d9dd79cbdc7f698d05fac2f0e3dd4 Mon Sep 17 00:00:00 2001 From: Laurence Withers Date: Sat, 24 Nov 2007 14:27:48 +0000 Subject: [PATCH 2/3] Properly set CGIDIR --- skel/scripts/paths | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/skel/scripts/paths b/skel/scripts/paths index 59aea24..6259c17 100644 --- a/skel/scripts/paths +++ b/skel/scripts/paths @@ -70,8 +70,6 @@ case "${PREFIX}" in ;; esac -MY_CGIDIR="${WEBDIR}/cgi-bin" - # assign paths allowing user to override [ -z "${BINDIR}" ] && BINDIR="${MY_BINDIR}" [ -z "${SBINDIR}" ] && SBINDIR="${MY_SBINDIR}" @@ -81,7 +79,7 @@ MY_CGIDIR="${WEBDIR}/cgi-bin" [ -z "${VARDIR}" ] && VARDIR="${MY_VARDIR}" [ -z "${DOCSDIR}" ] && DOCSDIR="${MY_DOCSDIR}" [ -z "${WEBDIR}" ] && WEBDIR="${MY_WEBDIR}" -[ -z "${CGIDIR}" ] && CGIDIR="${MY_CGIDIR}" +[ -z "${CGIDIR}" ] && CGIDIR="${WEBDIR}/cgi-bin" # kate: @KATE_MODELINE@ # vim: syntax=sh:@VIM_MODELINE@ From e815190cdad93c433ef98af480aa365d66c82ad4 Mon Sep 17 00:00:00 2001 From: Laurence Withers Date: Tue, 15 Jan 2008 14:18:09 +0000 Subject: [PATCH 3/3] Don't recurse --- scripts/build.make.none/build.make | 2 -- 1 file changed, 2 deletions(-) diff --git a/scripts/build.make.none/build.make b/scripts/build.make.none/build.make index 1102466..e1aab86 100644 --- a/scripts/build.make.none/build.make +++ b/scripts/build.make.none/build.make @@ -1,5 +1,3 @@ -build_target @NAME@ - echo "Building @NAME@ (via Makefile)" export MAKE_OBJDIR="$(pwd)/obj/@NAME@" mkdir -p "${MAKE_OBJDIR}"