From ce660038ed58ec2f62b6e0d16702db47680f4f61 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Mon, 23 Sep 2013 13:20:47 +0200 Subject: [PATCH] whoops --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index ab1e4d43..8ea84026 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)) + $(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)))) -- 2.43.0