X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=385a61b4158fb10b0626e1f238de820a2639dfcc;hb=4953630cabc98fbed061cab94bca0b4d0c6f064d;hp=4def70c45309d31d63723712cd161adce9b72bdd;hpb=73403c973f0903b4b8f84507e37503c53e0d41fd;p=build.git

diff --git a/Makefile b/Makefile
index 4def70c4..385a61b4 100644
--- a/Makefile
+++ b/Makefile
@@ -110,7 +110,7 @@
 ####################
 
 # exported to spec files as plrelease
-PLANETLAB_RELEASE = 5.1
+PLANETLAB_RELEASE = 5.2
 
 #
 # Default values
@@ -660,11 +660,16 @@ $(foreach package,$(ALL),$(eval $(call target_depends,$(package))))
 
 ####################
 # very rough for now (one module per package), targets only sfa for now
+# the general idea here is, changing the specfile (for version number and all) is enough, and this
+# gets passed to "make debian" in the module
+# PREFIX: at one point we had passed PREFIX=/usr to this 'make debian' 
+# however it turned out we could manage this some other way (see manifold)
+# so I'm reverting to simplicity
 define target_debian
 $(1)-debian: $(1)-tarball
 	mkdir -p DEBIAN/$(1)
 	rsync -a MODULES/$(1)/ DEBIAN/$(1)/
-	make -C DEBIAN/$(1) "TARBALL=$(HOME)/$($(1).tarballs)" debian
+	make -C DEBIAN/$(1) "RPMTARBALL=$(HOME)/$($(1).tarballs)" "RPMVERSION=$($(1).rpm-version)" "RPMRELEASE=$($(1).rpm-release)" "RPMNAME=$($(1).rpm-name)" debian
 endef
 
 $(foreach package,$(ALL),$(eval $(call target_debian,$(package))))