Fix order; ini already uses debug*() routines

src/include/mkit.sh

@@ -5,27 +5,6 @@
 . "$MKIT_DIR/include/release.sh" || die "cannot import release.sh"
 . "$MKIT_DIR/include/ini.sh"    || die "cannot import ini.sh"
 
-MKIT_INI=${MKIT_INI:-mkit.ini}
-MKIT_INI_EXPAND=2
-MKIT_PKGNAME=$(ini 1value "ENV:PKGNAME")
-MKIT_PROJNAME=$(ini 1value "ENV:PROJNAME")
-MKIT_DEFAULT_MODE="644"
-
-mkit_init() {
-    #
-    # Do basic initialization
-    #
-    # Check for ini file, load variables from config.mk
-    #
-    test -f "$MKIT_INI" || die "cannot find mkit.ini: $MKIT_INI"
-    tmp=$(mktemp)
-    sed -e 's/ = /=/' < config.mk > "$tmp"
-    . "$tmp"
-    rm -f "$tmp"
-    test -n "$(tr -d '[:space:]' <<<"$MKIT_LOCAL")" \
-     || die "MKIT_LOCAL must be non-blank: '$MKIT_LOCAL'"
-}
-
 debug() {
     #
     # Print debug message
@@ -51,6 +30,27 @@ debug_var() {
     done
 }
 
+MKIT_INI=${MKIT_INI:-mkit.ini}
+MKIT_INI_EXPAND=2
+MKIT_PKGNAME=$(ini 1value "ENV:PKGNAME")
+MKIT_PROJNAME=$(ini 1value "ENV:PROJNAME")
+MKIT_DEFAULT_MODE="644"
+
+mkit_init() {
+    #
+    # Do basic initialization
+    #
+    # Check for ini file, load variables from config.mk
+    #
+    test -f "$MKIT_INI" || die "cannot find mkit.ini: $MKIT_INI"
+    tmp=$(mktemp)
+    sed -e 's/ = /=/' < config.mk > "$tmp"
+    . "$tmp"
+    rm -f "$tmp"
+    test -n "$(tr -d '[:space:]' <<<"$MKIT_LOCAL")" \
+     || die "MKIT_LOCAL must be non-blank: '$MKIT_LOCAL'"
+}
+
 die() {
     #
     # Exit with message and non-zero exit status