fix for remote pldistros

[build.git] / Makefile

diff --git a/Makefile b/Makefile
index a9fa618..b936a4a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -109,7 +109,8 @@ RPM-INSTALL-DEVEL := rpm --force -Uvh
 # need to ignore result, kernel-headers cannot be uninstalled as glibc depends on it
 RPM-UNINSTALL-DEVEL := rpm -e
 
-REMOTE-PLDISTROS="gnuradio"
+# see also below
+REMOTE-PLDISTROS="wextoolbox"
 
 #################### Makefile
 # Default target
@@ -177,7 +178,9 @@ DISTCLEANS += $(1).mk $(2).mk config.$(1)
 
 endef
 
-$(eval $(call remote_pldistro,gnuradio,gnuradio-tags))
+# somehow this does not work, handle manually instead
+#$(foreach distro, $(REMOTE-PLDISTROS), $(eval $(call remote_pldistro,$(distro),$(distro)-tags)))
+$(eval $(call remote_pldistro,wextoolbox,wextoolbox-tags))
 
 ########## stage1 and stage1iter
 # extract specs and compute .mk files by running 
@@ -330,6 +333,7 @@ endif
        rm -f $@ 
        echo "%_topdir $(HOME)" >> $@
        echo "%_tmppath $(HOME)/tmp" >> $@
+       echo "%__spec_install_pre %{___build_pre}" >> $@
        ./getrpmmacros.sh >> $@
 
 ### this utility allows to extract various info from a spec file
@@ -356,6 +360,9 @@ savedpldistro.mk:
        echo "PERSONALITY:=$(PERSONALITY)" >> $@
        echo "MAILTO:=$(MAILTO)" >> $@
        echo "BASE:=$(BASE)" >> $@
+       echo "WEBPATH:=$(WEBPATH)" >> $@
+       echo "TESTBUILDURL:=$(TESTBUILDURL)" >> $@
+       echo "WEBROOT:=$(WEBROOT)" >> $@
 
 savedpldistro: savedpldistro.mk
 .PHONY: savedpldistro
@@ -722,7 +729,7 @@ info: packages modules branches
 
 ####################
 tests_svnpath:
-       @$(if $(TESTS_SVNPATH), echo $(TESTS_SVNPATH) > $@, \
+       @$(if $(tests-SVNPATH), echo $(tests-SVNPATH) > $@, \
        echo "http://svn.planet-lab.org/svn/tests/trunk" > $@)