[or-cvs] r19676: {torvm} Cleanup the precache logic and make sure builds with existin (torvm/trunk)

[coderman at seul.org]

Author: coderman
Date: 2009-06-09 11:08:09 -0400 (Tue, 09 Jun 2009)
New Revision: 19676

Modified:
   torvm/trunk/Makefile
Log:
Cleanup the precache logic and make sure builds with existing local read-only caches still work.

Modified: torvm/trunk/Makefile
===================================================================
--- torvm/trunk/Makefile	2009-06-09 14:47:46 UTC (rev 19675)
+++ torvm/trunk/Makefile	2009-06-09 15:08:09 UTC (rev 19676)
@@ -39,13 +39,9 @@
 ifeq (,$(SDLDIR))
 	SDLDIR=./build/repos
 endif
-ifeq (,$(SRCDLDIR))
-	SRCDLDIR=./build/sources
-endif
 override DLDIR:=$(realpath $(DLDIR))
 override WDLDIR:=$(realpath $(WDLDIR))
 override SDLDIR:=$(realpath $(SDLDIR))
-override SRCDLDIR:=$(realpath $(SRCDLDIR))
 
 ifeq (,$(NO_PRECACHE))
 PRECACHE_OPT=precache
@@ -60,8 +56,9 @@
 export DLDIR
 export WDLDIR
 export SDLDIR
-export SRCDLDIR
 
+OK:=echo -n
+
 default all: prereq import buildtree buildkern buildlicense buildw32
 
 #XXX move this into configure
@@ -84,9 +81,6 @@
 		echo "directory \"$(SDLDIR)\" does not exist."; \
 		exit 1; \
 	fi;
-	@chown $(BUSER):$(BGROUP) $(DLDIR)
-	@chown $(BUSER):$(BGROUP) $(WDLDIR)
-	@chown $(BUSER):$(BGROUP) $(SDLDIR)
 	@if [ ! -f .build_prereqs_verified ]; then \
 		echo "Verifying build prerequisites ..." >&2; \
 		NOFOUND=""; \
@@ -115,6 +109,9 @@
 		rm -f .test >/dev/null 2>&1; \
 		touch .build_prereqs_verified; \
 	fi
+	@chown $(BUSER):$(BGROUP) $(DLDIR) || $(OK)
+	@chown $(BUSER):$(BGROUP) $(WDLDIR) || $(OK)
+	@chown $(BUSER):$(BGROUP) $(SDLDIR) || $(OK)
 
 precache: prereq
 	@echo "Attempting pre-cache of kamikaze packages ..."