whoops
authorThierry Parmentelat <thierry.parmentelat@inria.fr>
Mon, 23 Sep 2013 11:20:47 +0000 (13:20 +0200)
committerThierry Parmentelat <thierry.parmentelat@inria.fr>
Mon, 23 Sep 2013 11:20:47 +0000 (13:20 +0200)
Makefile

index ab1e4d4..8ea8402 100644 (file)
--- 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_rpm
+define dpkgapt_install_stock_deb
        $(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))
+       $(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))
+       $(dpkgapt_uninstall_stock_debs $(1))
 endef
 
 $(foreach package,$(ALL),$(eval $(call target_debian,$(package))))