Move all global definitions to one place

src/include/mkit.sh

@@ -5,32 +5,6 @@
 . "$MKIT_DIR/include/release.sh" || die "cannot import release.sh"
 . "$MKIT_DIR/include/ini.sh"    || die "cannot import ini.sh"
 
-#
-# Path to mkit.ini
-#
-MKIT_INI=${MKIT_INI:-mkit.ini}
-
-#
-# Limit ini expansion depth
-#
-# To avoid endless loops, this value is subtracted each
-# time ini() expands a reference; when zero is reached,
-# no more expansions happen.
-#
-MKIT_INI_EXPAND=2
-
-#
-# Package name
-#
-# Used as base for tarball and in some default tokens.
-#
-MKIT_PROJ_PKGNAME=""
-
-#
-# Default deploy mode for files
-#
-MKIT_DEFAULT_MODE="644"
-
 _valid_targets() {
     #
     # List valid routes

src/make.skel

@@ -12,6 +12,11 @@ die() {
 #
 MKIT_DEBUG=${MKIT_DEBUG:-false}
 
+#
+# Default deploy mode for files
+#
+MKIT_DEFAULT_MODE="644"
+
 #
 # Path to MKit dir (where 'include' is)
 #
@@ -24,6 +29,20 @@ MKIT_DIR=${MKIT_DIR:-$(dirname "$0")}
 #
 MKIT_DRY=${MKIT_DRY:-false}
 
+#
+# Path to mkit.ini
+#
+MKIT_INI=${MKIT_INI:-mkit.ini}
+
+#
+# Limit ini expansion depth
+#
+# To avoid endless loops, this value is subtracted each
+# time ini() expands a reference; when zero is reached,
+# no more expansions happen.
+#
+MKIT_INI_EXPAND=2
+
 #
 # Path to MKit local config and temp
 #
@@ -32,6 +51,13 @@ MKIT_DRY=${MKIT_DRY:-false}
 #
 MKIT_LOCAL=${MKIT_LOCAL:-.mkit}
 
+#
+# Package name
+#
+# Used as base for tarball and in some default tokens.
+#
+MKIT_PROJ_PKGNAME=""
+
 #
 # This MKit version
 #