Setting tag nodeupdate-0.5-11

[build.git] / Makefile

diff --git a/Makefile b/Makefile
index ab1e4d4..669471f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -381,7 +381,6 @@ endef
 $(foreach module,$(ALL.modules),$(eval $(call target_extract_module,$(module))))
 
 ### the tests area
-# use this makefile to extract tests rather than extracting manually in vbuild-nightly
 build-clean:
        rm -rf MODULES/build
 .PHONY: build-clean
@@ -552,11 +551,11 @@ endef
 DPKGAPT-INSTALL-STOCK := apt-get -y install
 DPKGAPT-UNINSTALL-STOCK := echo WARNING uninstalling stock debs not implemented
 
-define dpkgapt_install_stock_rpms 
+define dpkgapt_install_stock_debs 
        $(if $($(1)-STOCK-DEVEL-DEBS), echo "Installing for $(1)-STOCK-DEVEL-DEBS" ; $(DPKGAPT-INSTALL-STOCK) $($(1)-STOCK-DEVEL-DEBS))
 endef
 
-define dpkgapt_uninstall_stock_rpms
+define dpkgapt_uninstall_stock_debs
        -$(if $($(1)-LOCAL-DEVEL-DEBS), echo "Unstalling for $(1)-LOCAL-DEVEL-DEBS" ; $(DPKGAPT-UNINSTALL-STOCK) $($(1)-LOCAL-DEVEL-DEBS))
 endef
 
@@ -683,11 +682,11 @@ $(foreach package,$(ALL),$(eval $(call target_depends,$(package))))
 # so I'm reverting to simplicity
 define target_debian
 $(1)-debian: $(1)-tarball
-       $(dpkgapt-install-stock $(1))
+       $(call dpkgapt_install_stock_debs,$(1))
        mkdir -p DEBIAN/$(1)
        rsync -a MODULES/$(1)/ DEBIAN/$(1)/
        make -C DEBIAN/$(1) "RPMTARBALL=$(HOME)/$($(1).tarballs)" "RPMVERSION=$($(1).rpm-version)" "RPMRELEASE=$($(1).rpm-release)" "RPMNAME=$($(1).rpm-name)" debian
-       $(dpkgapt-uninstall-stock $(1))
+       $(call dpkgapt_uninstall_stock_debs,$(1))
 endef
 
 $(foreach package,$(ALL),$(eval $(call target_debian,$(package))))