# HG changeset patch
# User adb014
# Date 1160341523 0
# Node ID bad2a3ed61a92c3e55c4724853f143515447ee53
# Parent  999a1ff22d5a3bc07b51c21942160c4e2ff738c5
Remove infinite loop on build failure. Don't fail if fntest.log is missing

diff -r 999a1ff22d5a -r bad2a3ed61a9 packages/Makefile
--- a/packages/Makefile	Sun Oct 08 20:41:53 2006 +0000
+++ b/packages/Makefile	Sun Oct 08 21:05:23 2006 +0000
@@ -41,7 +41,7 @@
 srpms: $(patsubst %, srpm/%, $(PACKAGES)) $(patsubst %, metarpm/%, $(PKGDIRS))
 
 cleanlog:
-	@rm $(TESTLOG)
+	@rm -f $(TESTLOG)
 
 install:
 	@echo "***  INSTALLING ALL PACKAGES  ***"; \
@@ -54,16 +54,16 @@
 	octave -H -q --eval "$$cmd;"
 
 # No spaces in eval argument please!!
-checkpkg/%: cleancheck mkpkg/%
+checkpkg/%: cleancheck/% mkpkg/%
 	@echo "Running test code for $(opkg) and its dependencies" ; \
 	cd sandbox; \
 	$(TOPDIR)/admin/mktests.sh code; \
 	$(RUN_OCTAVE) --eval "pkg('load','all');fntests" ; \
-	if [ ! -e ../fntests.log ]; then touch ../fntests.log; fi ; \
+	if [ ! -e $(TESTLOG) ]; then touch $(TESTLOG); fi ; \
 	cat fntests.log >> $(TESTLOG); \
 	cd ..
 
-icheckpkg/%: clencheck mkpkg/%
+icheckpkg/%: cleancheck/% mkpkg/%
 	@echo "Running demo code for $(opkg) and its dependencies" ; \
 	cd sandbox; \
 	echo 'disp("starting demos...")' > fndemos.m; \
@@ -71,7 +71,7 @@
 	  echo "demo('$$file');" >> fndemos.m ; done
 	$(RUN_OCTAVE) -q fndemos.m
 
-cleancheck:
+cleancheck/%:
 	@if [ -d sandbox/ ]; then rm -rf sandbox; fi ; \
 	mkdir sandbox; \
 	cd sandbox; \
@@ -92,13 +92,16 @@
 	  deps=`cat baddeps | grep " needs " | sed -e 's/^.*needs\s\+\(\S*\).*$$/\1/'`; \
 	  ops=`cat  baddeps | grep " needs " | sed -e 's/^.*needs\s\+\S*\s\+\(\S*\).*$$/\1/'`; \
 	  vers=`cat  baddeps | grep " needs " | sed -e 's/^.*\s\+\(\S*\)\s*$$/\1/'`; \
+	  if [ -z $$deps ] && [ -z $$ops ] && [ -z $$vers ]; then \
+	    echo "Failed to build $(opkg)!!!"; \
+	    break; \
+	  fi; \
 	  for _dep in $$deps; do \
 	    for _dir in $(PKGDIRS); do \
 	      if [ -d ../$$_dir ]; then \
 		_fdep=`find ../$$_dir -name "$$_dep*"`; \
 		if [ -n "$$_fdep" ]; then \
 		  pkgs="'$$_fdep',$$pkgs"; \
-		  cd code; tar xzf ../$$_fdep; cd ..; \
 		  break 2; \
 		fi; \
 	      fi; \