From 8404ad50b5e1bf09d5fabe9eed43cef81589668b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mikolai=20G=C3=BCtschow?= Date: Fri, 29 Sep 2023 15:08:26 +0200 Subject: [PATCH] pkg/c25519: unify Makefile variables --- pkg/c25519/Makefile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkg/c25519/Makefile b/pkg/c25519/Makefile index b65ddbc45f..06dd824850 100644 --- a/pkg/c25519/Makefile +++ b/pkg/c25519/Makefile @@ -7,6 +7,7 @@ PKG_SHA512 = dbfb4285837ab2ea3d99c448b22877cc7a139ccbaebb1de367e2bec1fd562fe629 PKG_SOURCE_DIR ?= $(PKGDIRBASE)/$(PKG_NAME) PKG_ZIPFILE = $(PKGDIRBASE)/$(PKG_NAME)-$(PKG_VERSION).$(PKG_EXT) +PKG_ZIP_URL = $(PKG_URL)/$(PKG_NAME)-$(PKG_VERSION).$(PKG_EXT) ifneq ($(RIOTBASE),) include $(RIOTBASE)/Makefile.base @@ -19,17 +20,17 @@ prepare: $(PKG_SOURCE_DIR)/ all: $(PKG_SOURCE_DIR)/ $(QQ)"$(MAKE)" -C $(PKG_SOURCE_DIR)/src -f $(RIOTBASE)/Makefile.base MODULE=$(PKG_NAME) -$(PKG_SOURCE_DIR)/: $(PKGDIRBASE)/$(PKG_NAME)-$(PKG_VERSION).$(PKG_EXT) - $(QQ)test "$(PKG_SHA512) $(PKG_ZIPFILE)" = "$$(sha512sum "${PKG_ZIPFILE}")" +$(PKG_SOURCE_DIR)/: $(PKG_ZIPFILE) + $(QQ)test "$(PKG_SHA512) $(PKG_ZIPFILE)" = "$$(sha512sum "$(PKG_ZIPFILE)")" $(Q)$(UNZIP_HERE) -D -d $(PKGDIRBASE) $< $(PKG_ZIPFILE): $(QQ)mkdir -p $(PKGDIRBASE) - $(Q)$(DOWNLOAD_TO_FILE) $@ $(PKG_URL)/$(PKG_NAME)-$(PKG_VERSION).$(PKG_EXT) + $(Q)$(DOWNLOAD_TO_FILE) $@ $(PKG_ZIP_URL) clean:: # Reset package to checkout state. rm -rf $(PKG_SOURCE_DIR) distclean:: - rm -rf $(PKG_SOURCE_DIR) $(PKGDIRBASE)/$(PKG_NAME)-$(PKG_VERSION).$(PKG_EXT) + rm -rf $(PKG_SOURCE_DIR) $(PKG_ZIPFILE)