From 69b708f8647c34c42b375c223de42ef4b72086f7 Mon Sep 17 00:00:00 2001 From: Thomas Berezansky Date: Mon, 30 Jan 2012 13:11:19 -0500 Subject: [PATCH] Fix AccessControl plugin extraction Apparently they ditched a containing folder in the zip...lets autodetect that from now on. Signed-off-by: Thomas Berezansky Signed-off-by: Michael Peters Signed-off-by: Mike Rylander --- Open-ILS/xul/staff_client/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Open-ILS/xul/staff_client/Makefile.am b/Open-ILS/xul/staff_client/Makefile.am index 2105271d70..bcd8bd353b 100644 --- a/Open-ILS/xul/staff_client/Makefile.am +++ b/Open-ILS/xul/staff_client/Makefile.am @@ -290,7 +290,7 @@ linux-xulrunner: client_app # Build a windows installer. win-client: nsis_check win-xulrunner - @if [ "${NSIS_AUTOUPDATE}${NSIS_PERMACHINE}" -a ! -d AccessControl ]; then echo 'Fetching AccessControl Plugin'; wget ${NSIS_ACCESSCONTROL} -O AccessControl.zip; unzip AccessControl.zip; fi + @if [ "${NSIS_AUTOUPDATE}${NSIS_PERMACHINE}" -a ! -d AccessControl ]; then echo 'Fetching AccessControl Plugin'; wget ${NSIS_ACCESSCONTROL} -O AccessControl.zip; unzip AccessControl.zip $$(unzip -t AccessControl.zip | grep 'AccessControl/Contrib/' > /dev/null || echo "-dAccessControl"); fi @echo 'Building installer' @makensis -V2 -DPRODUCT_VERSION="${STAFF_CLIENT_VERSION}" ${NSIS_WICON} ${NSIS_AUTOUPDATE} ${NSIS_DEV} ${NSIS_PERMACHINE} ${NSIS_EXTRAS} ${NSIS_EXTRAOPTS} windowssetup.nsi @echo 'Done' -- 2.11.0