From 7ff8c2280beda7bc5b66695ef66287b78ebf6125 Mon Sep 17 00:00:00 2001 From: "Alex A. Naanou" Date: Mon, 14 Nov 2022 03:40:13 +0300 Subject: [PATCH] Makefile refactoring... Signed-off-by: Alex A. Naanou --- .github/workflows/make-dist.yml | 2 +- Makefile | 13 +++++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.github/workflows/make-dist.yml b/.github/workflows/make-dist.yml index eb2fbd1..49489a4 100644 --- a/.github/workflows/make-dist.yml +++ b/.github/workflows/make-dist.yml @@ -51,9 +51,9 @@ jobs: action: upload file_path: dist/photobook.zip fields: | + update: true pkg: photobook version: ${{ env.VERSION }} - update: true author: Alex A. Naanou email: alex.nanou@gmail.com uploader: Alex A. Naanou diff --git a/Makefile b/Makefile index 499f9c8..ef68ad5 100644 --- a/Makefile +++ b/Makefile @@ -121,12 +121,17 @@ DIST_NAME := $(MODULE)-$(VERSION)-$(DATE) DIST_DIR := dist DIST_SCRIPTS = \ $(wildcard scripts/*) -DIST_FILES = \ +# NOTE: these are separate to unset the x bit... +DIST_NORMAL_FILES = \ README.md \ LICENSE \ Makefile \ $(MODULE).cls \ $(MODULE).pdf +DIST_FILES = \ + $(DIST_SCRIPTS) \ + $(DIST_NORMAL_FILES) \ + # Add these when ready... # $(wildcard examples/*) \ # $(wildcard manual/*) \ @@ -269,10 +274,10 @@ manual: .PHONY: dist -dist: $(DIST_FILES) $(DIST_SCRIPTS) +dist: $(DIST_FILES) $(MD) $(DIST_DIR) - chmod 644 $(DIST_FILES) - zip -Drq $(DIST_DIR)/$(DIST_NAME).zip $(DIST_FILES) $(DIST_SCRIPTS) + chmod 644 $(DIST_NORMAL_FILES) + zip -Drq $(DIST_DIR)/$(DIST_NAME).zip $(DIST_FILES) # Place everything in the module dir as per CTAN spec... zipnote $(DIST_DIR)/$(DIST_NAME).zip \ | sed 's/^\@ \([^(].*\)$$/@ \1\n@=$(MODULE)\/\1/' \