Update stage scripts (install scripts, forwarded configurations)

1 files changed, 13 insertions, 1 deletions

diff --git a/stage-pkg b/stage-pkg
index 5420e3c..af63f54 100755
--- a/stage-pkg
+++ b/stage-pkg
@@ -80,6 +80,18 @@ function dist() # <group> <dir>
 {
   local o="$repo_dir/$1"
   local b="$(basename $2)"
+  local d="$2-default"
+
+  # If *-default/ exists, use that (old style out of tree configuration).
+  # Otherwise, use the source directory itself (new style forwarded
+  # configuration).
+  #
+  if ! test -d "$d"; then
+    d="$2"
+    if ! test -d "$d"; then
+      error "neither $2-default nor $2 exist"
+    fi
+  fi
 
   mkdir -p "$o"
 
@@ -89,7 +101,7 @@ function dist() # <group> <dir>
     rm -f "$o/$b"-*
   fi
 
-  b "dist($2-default/)" "config.dist.archives=$owd/$o/tar.gz"
+  b "dist($d/)" "config.dist.archives=$owd/$o/tar.gz"
 }
 
 for d in "${dirs[@]}"; do