support for diff and -0

[build.git] / Makefile

diff --git a/Makefile b/Makefile
index bc72f69..fd7f8d9 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -208,6 +208,7 @@ define stage1_variables
 $(1).spec = $(notdir $($(1)-SPEC))
 $(1).specpath = SPECS/$(1).spec
 $(1).module = $(firstword $($(1)-MODULES))
+$(1)-SVNPATH = $(strip $($(1)-SVNPATH))
 endef
 
 $(foreach package, $(ALL), $(eval $(call stage1_variables,$(package))))
@@ -233,9 +234,9 @@ define target_spec
 $($(1).specpath):
        mkdir -p SPECS
        (echo -n "# Generated by planetlab build from $($(1)-SPEC) on " ; date) > $($(1).specpath)
-       echo "%define distroname $(DISTRO)" >> $($(1).specpath)
+       echo "%define distro $(DISTRO)" >> $($(1).specpath)
        echo "%define distrorelease $(RELEASE)" >> $($(1).specpath)
-       echo "%define distrovsname $(DISTRONAME)" >> $($(1).specpath)
+       echo "%define distroname $(DISTRONAME)" >> $($(1).specpath)
        echo "%define pldistro $(PLDISTRO)" >> $($(1).specpath)
        echo "%define plrelease $(PLANETLAB_RELEASE)" >> $($(1).specpath)
        $(if $($(1).has-date),echo "%define date $(shell date +%Y.%m.%d)" >> $($(1).specpath),)
@@ -587,11 +588,12 @@ version-build:
        @echo -n 'Build build-time: ' ; date '+%H:%M-%Z'
        @echo -n 'Build build-hostname: ' ; hostname
        @echo    "Build build-base: $(NIGHTLY_BASE)"
-       @echo    "Build planetab-distro: $(PLDISTRO)"
+       @echo    "Build planetlab-distro: $(PLDISTRO)"
        @echo    "Build planetlab-tags: $(PLDISTROTAGS)"
        @echo -n 'Build planetlab-tagsid: ' ; fgrep '$$''Id' $(PLDISTROTAGS)
        @echo    "Build target-arch: $(HOSTARCH)"
        @echo    "Build target-distro: $(DISTRO)"
+       @echo    "Build target-distroname: $(DISTRONAME)"
        @echo    "Build target-release: $(RELEASE)"     
        @echo    "Build target-personality: $(NIGHTLY_PERSONALITY)"