X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=3a623fb83e24cdb0eba5efb6502983d199240d98;hb=00c829b8272a47780efb1863407fe563b9054a69;hp=ab1e4d432f2b154c13af35892d383b0206b3f34a;hpb=38e1b3fbaab1ff3661c12094c1dfb769b9255300;p=build.git

diff --git a/Makefile b/Makefile
index ab1e4d43..3a623fb8 100644
--- a/Makefile
+++ b/Makefile
@@ -552,11 +552,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 +683,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))))