mkbuild

commit e43378a86f7b23581ce9f7d8282f79f1ea1d49a1
parent 1cd0eb9eb568e6757335930e64a68c914f251d12
Author: Daniel Bainton <dpb@driftaway.org>
Date:   Mon,  7 Apr 2014 14:06:29 +0300

configmk changes

Diffstat:
M
mk.3rdparty
 | 
10
+++++-----
M
mk.config
 | 
5
++---
M
mk.deps
 | 
2
+-
M
mk.parent
 | 
8
++++----

4 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/mk.3rdparty b/mk.3rdparty
@@ -10,9 +10,9 @@ build:QV: fetch
 	t=$(cmp -s $mkfile $oldpwd/.cache || echo $?)
 	if test "$t" != ""; then
 		if test "${targ}" != ""; then
-			env -i PATH="$PATH" mkbuild="$mkbuild" TARG="${targ}" mk -f $mkfile
+			env -i PATH="$PATH" configmk="$configmk" mkbuild="$mkbuild" TARG="${targ}" mk -f $mkfile
 		else
-			env -i PATH="$PATH" mkbuild="$mkbuild" mk -f $mkfile
+			env -i PATH="$PATH" configmk="$configmk" mkbuild="$mkbuild" mk -f $mkfile
 		fi
 		cp $mkfile $oldpwd/.cache
 	fi
@@ -20,16 +20,16 @@ build:QV: fetch
 install:QV: all
 	cd $src
 	if test "${targ}" != ""; then
-		env -i PATH="$PATH" mkbuild="$mkbuild" mk -f $mkfile install TARG="${targ}" ROOT="${ROOT}"
+		env -i PATH="$PATH" configmk="$configmk" mkbuild="$mkbuild" mk -f $mkfile install TARG="${targ}" ROOT="${ROOT}"
 	else
-		env -i PATH="$PATH" mkbuild="$mkbuild" mk -f $mkfile install ROOT="${ROOT}"
+		env -i PATH="$PATH" configmk="$configmk" mkbuild="$mkbuild" mk -f $mkfile install ROOT="${ROOT}"
 	fi
 
 clean:QV:
 	rm -f .cache
 	if test -d $src; then
 		cd $src
-		env -i PATH="$PATH" mkbuild="$mkbuild" mk -f $mkfile clean
+		env -i PATH="$PATH" configmk="$configmk" mkbuild="$mkbuild" mk -f $mkfile clean
 	fi
 
 <$mkbuild/mk.fetch
diff --git a/mk.config b/mk.config
@@ -1,2 +1,2 @@
-configmk = $mkbuild/config.mk
-<$configmk
-\ No newline at end of file
+
+<| if test x"$configmk" != x""; then cat $configmk; else cat $mkbuild/config.mk; fi
diff --git a/mk.deps b/mk.deps
@@ -9,7 +9,7 @@ paths = `{ find $pkgdirs -type f -name mkfile }
 		if test "$i" = "$pkg"; then \
 			printf "${i}_DEPDIR = $dir\n\n"; \
 			printf "<$dir/depsinc.mk\n\n"; \
-			printf "$pkg:QV:\n\tcd $dir\n\tenv -i PATH=\"$PATH\" mkbuild=\"$mkbuild\" mk\n\n"; \
+			printf "$pkg:QV:\n\tcd $dir\n\tenv -i PATH=\"$PATH\" configmk=\"$configmk\" mkbuild=\"$mkbuild\" mk\n\n"; \
 		fi; \
 	done; \
 done >> .deps.mk }
diff --git a/mk.parent b/mk.parent
@@ -4,13 +4,13 @@ all:QV: $TARG
 	
 
 `{ echo "# Auto-generated file by mk, do not edit" > .targs.mk }
-`{ for i in $TARG; do printf "$i:QV:\n\tcd $i\n\tenv -i PATH=\"$PATH\" mkbuild=\"$mkbuild\" mk\n\n" ; done >> .targs.mk }
+`{ for i in $TARG; do printf "$i:QV:\n\tcd $i\n\tenv -i PATH=\"$PATH\" configmk="$configmk" mkbuild=\"$mkbuild\" mk\n\n" ; done >> .targs.mk }
 <.targs.mk
 
 install:QV:
 	for t in $TARG; do
 		cd $t
-		env -i PATH="$PATH" mkbuild="$mkbuild" mk install ROOT="${ROOT}"
+		env -i PATH="$PATH" configmk="$configmk" mkbuild="$mkbuild" mk install ROOT="${ROOT}"
 		cd ..
 	done
 
@@ -18,14 +18,14 @@ clean:QV:
 	rm .targs.mk
 	for t in $TARG; do
 		cd $t
-		env -i PATH="$PATH" mkbuild="$mkbuild" mk clean
+		env -i PATH="$PATH" configmk="$configmk" mkbuild="$mkbuild" mk clean
 		cd ..
 	done
 
 fetch:QV:
 	for t in $TARG; do
 		cd $t
-		env -i PATH="$PATH" mkbuild="$mkbuild" mk fetch
+		env -i PATH="$PATH" configmk="$configmk" mkbuild="$mkbuild" mk fetch
 		cd ..
 	done