better handling of failures during spec2make - not enough to get make to fail though

[build.git] / Makefile

diff --git a/Makefile b/Makefile
index 7250115..b405fac 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -136,7 +136,8 @@ include $(PLDISTROTAGS)
 # so now the nightly build script sets this to what it is currently using
 # we set a default in case we run the build manually:
 # if the local directory was svn checked out, then use the corresponding URL
-default-build-SVNPATH := $(shell svn info 2> /dev/null | grep URL: | awk '{print $2;}')
+svn-info-url-line := $(shell svn info 2> /dev/null | grep URL:)
+default-build-SVNPATH := $(lastword $(svn-info-url-line))
 # otherwise, use this hard-coded default
 ifeq "$(default-build-SVNPATH)" ""
 default-build-SVNPATH := http://svn.planet-lab.org/svn/build/trunk
@@ -307,8 +308,7 @@ spec2make: spec2make.c
 define target_mk
 MAKE/$(1).mk: $($(1).specpath) spec2make .rpmmacros
        mkdir -p MAKE
-       ./spec2make $($(1)-RPMFLAGS) $($(1).specpath) $(1) > MAKE/$(1).mk
-       @if [ -z MAKE/$(1).mk ] ; then rm MAKE/$(1).mk ; exit 1 ; fi
+       ./spec2make $($(1)-RPMFLAGS) $($(1).specpath) $(1) > MAKE/$(1).mk || rm MAKE/$(1).mk
 endef
 
 $(foreach package,$(ALL),$(eval $(call target_mk,$(package))))
@@ -684,7 +684,7 @@ info: packages modules branches
 .PHONY: info packages modules branches module-tools
 
 ####################
-testsvnpath:
+tests_svnpath:
        @$(if $(TESTS_SVNPATH), echo $(TESTS_SVNPATH) > $@, \
        echo "http://svn.planet-lab.org/svn/tests/trunk" > $@)