Update mkit from Fastfoo 0.7.0+master.g8c72a9c

Makefile

@@ -4,39 +4,7 @@
 include config.mk
 include tfkit.mk
 
-all: options build
+MKIT_DIR=utils/mkit
+include $(MKIT_DIR)/mkit.mk
 
-options:
-	@echo saturnin build options:
-	@echo "VERSION  = ${VERSION}"
-	@echo "PRERELEASE = ${PRERELEASE}"
-	@echo "PREFIX   = ${PREFIX}"
-
-build:
-	@mkit/make build
-
-manpages: build
-	@mkit/make build_manpages
-
-clean:
-	@mkit/make clean
-
-dist: clean
-	@mkit/make dist
-
-install: all
-	@mkit/make install
-
-release_x:
-	@mkit/make release_x
-
-release_y:
-	@mkit/make release_y
-
-release_z:
-	@mkit/make release_z
-
-uninstall:
-	@mkit/make uninstall
-
-.PHONY: all options clean dist install uninstall
+.PHONY: test

mkit/config.ini → mkit.ini

@@ -15,9 +15,10 @@
     dist = config.mk
     dist = LICENSE
     dist = Makefile
-    dist = mkit
     dist = README
     dist = src
+    dist = tests
+    dist = utils
 
 [modes]
     bin     = 755

mkit/include/build.sh → utils/mkit/include/build.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. mkit/include/ini.sh || die "cannot import ini.sh"
+. $MKIT_DIR/include/ini.sh || die "cannot import ini.sh"
 
 
 build() {

mkit/include/mkit.sh → utils/mkit/include/mkit.sh

@@ -1,25 +1,30 @@
 #!/bin/bash
 
-. mkit/include/build.sh  || die "cannot import build.sh"
-. mkit/include/deploy.sh || die "cannot import deploy.sh"
-. mkit/include/release.sh || die "cannot import release.sh"
-. mkit/include/ini.sh    || die "cannot import ini.sh"
+. $MKIT_DIR/include/build.sh  || die "cannot import build.sh"
+. $MKIT_DIR/include/deploy.sh || die "cannot import deploy.sh"
+. $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/config.ini}
+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"
 
-configure() {
+mkit_init() {
     #
-    # Load variables fdom config.mk
+    # Do basic initialization
     #
+    # Check for ini file, load variables from config.mk, resolve
+    # and check for PREFIX
+    #
+    test -f "$MKIT_INI" || die "cannot find mkit.ini: $MKIT_INI"
     tmp=$(mktemp)
     sed -e 's/ = /=/' < config.mk > $tmp
     . $tmp
     rm -f $tmp
     PREFIX="$(readlink -f "$PREFIX")"
+    test -d "$PREFIX" || die "PREFIX points to bad directory: $PREFIX"
 }
 
 die() {

mkit/make → utils/mkit/make

@@ -6,8 +6,10 @@ die() {
     echo "$@" && exit 9
 }
 
-. mkit/include/mkit.sh || die "this must be run from project root"
+export MKIT_DIR=${MKIT_DIR:-mkit}
 
-configure
+. $MKIT_DIR/include/mkit.sh || die "failed to init; check if MKIT_DIR is set properly: $MKIT_DIR"
+
+mkit_init
 
 route "$@"

utils/mkit/mkit.mk

@@ -0,0 +1,41 @@
+# ffoo - Fastfoo - Bash dot on steroids
+# See LICENSE file for copyright and license details.
+
+export MKIT_DIR
+
+all: options build
+
+options:
+	@echo build options:
+	@echo "VERSION  = ${VERSION}"
+	@echo "PRERELEASE = ${PRERELEASE}"
+	@echo "PREFIX   = ${PREFIX}"
+
+build:
+	@$(MKIT_DIR)/make build
+
+manpages: build
+	@$(MKIT_DIR)/make build_manpages
+
+clean:
+	@$(MKIT_DIR)/make clean
+
+dist: clean
+	@$(MKIT_DIR)/make dist
+
+install: all
+	@$(MKIT_DIR)/make install
+
+release_x:
+	@$(MKIT_DIR)/make release_x
+
+release_y:
+	@$(MKIT_DIR)/make release_y
+
+release_z:
+	@$(MKIT_DIR)/make release_z
+
+uninstall:
+	@$(MKIT_DIR)/make uninstall
+
+.PHONY: all options clean dist install uninstall release_x release_y release_z