X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=1c601a9480fc430505aaaa9684cc1ce259464103;hb=6bbdfbecded67a8c30a1fe8d5f6e65d8259aee8e;hp=76db1106caf8db6140ea1e2fbba0f2fdae140722;hpb=190d418e99a8c31fbfd3474ce2314a5a5687fcf2;p=build.git diff --git a/Makefile b/Makefile index 76db1106..1c601a94 100644 --- a/Makefile +++ b/Makefile @@ -351,7 +351,7 @@ header.spec: echo "%global _source_filedigest_algorithm 1" >> $@ echo "%global _source_payload w9.gzdio" >> $@ echo "%global _binary_payload w9.gzdio" >> $@ -ifeq "$(DISTRONAME)""$(filter $(DISTRONAME),f23)" +ifeq "$(DISTRONAME)""$(filter $(DISTRONAME),f25 f27)" echo "%define debug_package %{nil}" >> $@ endif @@ -581,11 +581,11 @@ endef # install stock rpms if defined define rpmyum_install_stock_rpms - $(if $($(1)-STOCK-DEVEL-RPMS), echo "Installing for $(1)-STOCK-DEVEL-RPMS" ; $(RPMYUM-INSTALL-STOCK) $($(1)-STOCK-DEVEL-RPMS)) + $(if $($(1)-STOCK-DEVEL-RPMS), echo "Installing for $(1)-STOCK-DEVEL-RPMS" ; $(RPMYUM-INSTALL-STOCK) $($(1)-STOCK-DEVEL-RPMS) || true) endef define rpmyum_uninstall_stock_rpms - -$(if $($(1)-STOCK-DEVEL-RPMS), echo "Unstalling for $(1)-STOCK-DEVEL-RPMS" ; $(RPMYUM-UNINSTALL-STOCK) $($(1)-STOCK-DEVEL-RPMS)) + -$(if $($(1)-STOCK-DEVEL-RPMS), echo "Unstalling for $(1)-STOCK-DEVEL-RPMS" ; $(RPMYUM-UNINSTALL-STOCK) $($(1)-STOCK-DEVEL-RPMS) || true) endef # similar for debians @@ -599,11 +599,11 @@ define dpkgapt_install_local_debs endef define dpkgapt_install_stock_debs - $(if $($(1)-STOCK-DEVEL-DEBS), echo "Installing for $(1)-STOCK-DEVEL-DEBS" ; $(DPKGAPT-INSTALL-STOCK) $($(1)-STOCK-DEVEL-DEBS)) + $(if $($(1)-STOCK-DEVEL-DEBS), echo "Installing for $(1)-STOCK-DEVEL-DEBS" ; $(DPKGAPT-INSTALL-STOCK) $($(1)-STOCK-DEVEL-DEBS) || true) endef define dpkgapt_uninstall_stock_debs - -$(if $($(1)-STOCK-DEVEL-DEBS), echo "Unstalling for $(1)-STOCK-DEVEL-DEBS" ; $(DPKGAPT-UNINSTALL-STOCK) $($(1)-STOCK-DEVEL-DEBS)) + -$(if $($(1)-STOCK-DEVEL-DEBS), echo "Unstalling for $(1)-STOCK-DEVEL-DEBS" ; $(DPKGAPT-UNINSTALL-STOCK) $($(1)-STOCK-DEVEL-DEBS) || true) endef