From b62b00efa0e9913fa8abc25475e28ed83db5f9f6 Mon Sep 17 00:00:00 2001 From: cpmachado <40689339+cpmachado@users.noreply.github.com> Date: Tue, 29 Oct 2024 11:44:03 +0000 Subject: [PATCH] Fix dist path pollution in dist generation (#9) * Fix tar build * Simplify by cd to dist directory, and solve zip --- Makefile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 6c0aba6..e2f3156 100644 --- a/Makefile +++ b/Makefile @@ -21,7 +21,7 @@ BUILD_DIR = build OBJ_DIR = $(BUILD_DIR)/obj BIN_DIR = $(BUILD_DIR)/bin DIST_DIR = $(BUILD_DIR)/dist -DIST_BASE_DIR = $(DIST_DIR)/egc-$(VERSION) +DIST_BASE_DIR = egc-$(VERSION) LIBEGC_SRC_DIR = src/egc LIBEGC_OBJ_DIR = $(BUILD_DIR)/obj/egc @@ -61,9 +61,10 @@ options: dist: - mkdir -p $(DIST_BASE_DIR) - cp -r $(PKGFILES) $(DIST_BASE_DIR) - tar -cz -f $(DIST_BASE_DIR).tar.gz $(DIST_BASE_DIR) + mkdir -p $(DIST_DIR)/$(DIST_BASE_DIR) + cp -r $(PKGFILES) $(DIST_DIR)/$(DIST_BASE_DIR) + cd $(DIST_DIR); \ + tar -cz -f $(DIST_BASE_DIR).tar.gz $(DIST_BASE_DIR); \ zip -r $(DIST_BASE_DIR).zip $(DIST_BASE_DIR) install: egc