pucked plugins: Punt setup. Get PLUGINS shell array syntax right.

diff --git a/dist/make-src-files b/dist/make-src-files
index b349d92cf6f5386abad59cb1ad4773719c9d1fd5..6f02c71d9c3b16d4d0e8f98ec799ef93fca20226 100755 (executable)
--- a/dist/make-src-files
+++ b/dist/make-src-files
@@ -57,7 +57,7 @@ notify "Configuring the distribution directory"
 run_command "${SRC_OUT}"-config "${DIST_DIR}"/src ./Setup.sh
 run_command "${DOC_OUT}"-config "${DIST_DIR}"/doc reconf
 
-for PLUGIN in ${PLUGINS}; do
+for PLUGIN in ${PLUGINS[@]}; do
     my_rm_rf "${DIST_DIR}"/src/${PLUGIN}
 done
 

diff --git a/dist/shared.sh b/dist/shared.sh
index e4f719f08df892ada5bc8b1f12441d2fa8d57041..3776613264f546280b9328fce736886ecd48defd 100644 (file)
--- a/dist/shared.sh
+++ b/dist/shared.sh
@@ -101,8 +101,8 @@ NATIVE_OUT=${OUTPUT_DIR}/native
 MACOSX_OUT=${OUTPUT_DIR}/macosx
 
 PLUGINS=(blowfish gdbm mcrypt edwin imail x11 x11-screen)
-PLUGINS=($PLUGINS berkeley-db pgsql)
-PLUGINS=($PLUGINS cairo gl glib gtk gtk-screen pango planetarium devops)
+PLUGINS=(${PLUGINS[@]} berkeley-db pgsql)
+PLUGINS=(${PLUGINS[@]} cairo gl glib gtk gtk-screen pango planetarium devops)
 
 notify ()
 {

diff --git a/src/Setup.sh b/src/Setup.sh
index 538b9ff9d139a908a8ef16020459a067628360f7..d65a94577477e66812b24d75133d60c6a351f5e3 100755 (executable)
--- a/src/Setup.sh
+++ b/src/Setup.sh
@@ -108,6 +108,7 @@ for SUBDIR in ${INSTALLED_SUBDIRS} ${OTHER_SUBDIRS}; do
     (cd ${SUBDIR} && ./Setup.sh ${1+"$@"})
 done
 
+PLUGIN_SUBDIRS=
 for SUBDIR in ${PLUGIN_SUBDIRS}; do
     echo "setting up ${SUBDIR}"
     (cd ${SUBDIR} && ./autogen.sh)