zip.zip fix for bfs action

mittelmark · Mar 29, 2024 · 2e0c6a9 · 2e0c6a9
1 parent 983e3b7
commit 2e0c6a9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/.github/workflows/bfs-releases.yml b/.github/workflows/bfs-releases.yml
@@ -33,8 +33,8 @@ jobs:
 
     - name: Make zipimage
       run: |
-        make zip-unix
-        make zip-windows
+        make folder-unix
+        make folder-windows
         
     - name: Upload Linux Mecb Zips
       uses: actions/upload-artifact@v4
@@ -75,7 +75,7 @@ jobs:
 
     - name: Make zipimage
       run: |
-        make zip-unix
+        make folder-unix
         
     - name: Upload Linux Mecb Zips
       uses: actions/upload-artifact@v4

diff --git a/Makefile b/Makefile
@@ -89,22 +89,24 @@ docu-html:
 	for file in `ls htm/*.md` ; do pandoc $$file -f gfm -o htm/`basename $$file .md`.htm -s --css null.css; done
 run-tuser:
 	MENAME=tuser MEPATH=`pwd`/tuser:`pwd`/jasspa/macros src/.linux32gcc-release-mecw/mecw
-zip-unix:
+folder-unix:
 	-mkdir MicroEmacs09_$(version)_$(kernelname)-$(kernel)-$(machine)mecb
 	-mkdir MicroEmacs09_$(version)_$(kernelname)-$(kernel)-$(machine)mewb	
 	cp mec-linux.bin MicroEmacs09_$(version)_$(kernelname)-$(kernel)-$(machine)mecb/mecb
 	cp mew-linux.bin MicroEmacs09_$(version)_$(kernelname)-$(kernel)-$(machine)mewb/mewb
 	cp bfs/bfs-readme.md bin/bfs license.txt README.txt MicroEmacs09_$(version)_$(kernelname)-$(kernel)-$(machine)mecb/ 	
 	cp bfs/bfs-readme.md bin/bfs license.txt README.txt MicroEmacs09_$(version)_$(kernelname)-$(kernel)-$(machine)mewb/ 		
+zip-unix: folder-unix
 	zip MicroEmacs09_$(version)_$(kernelname)-$(kernel)-$(machine)mewb.zip MicroEmacs09_$(version)_$(kernelname)-$(kernel)-$(machine)mewb/*
 	zip MicroEmacs09_$(version)_$(kernelname)-$(kernel)-$(machine)mecb.zip MicroEmacs09_$(version)_$(kernelname)-$(kernel)-$(machine)mecb/*	
-zip-windows:
+folder-windows:
 	-mkdir MicroEmacs09_$(version)_windows-32-mecb
 	-mkdir MicroEmacs09_$(version)_windows-32-mewb	
 	cp mew-bfs-windows.exe MicroEmacs09_$(version)_windows-32-mewb/mewb.exe
 	cp mec-bfs-windows.exe MicroEmacs09_$(version)_windows-32-mecb/mewb.exe	
 	cp bfs/bfs-readme.md bin/bfs.exe README.txt license.txt MicroEmacs09_$(version)_windows-32-mewb/
 	cp bfs/bfs-readme.md bin/bfs.exe README.txt license.txt MicroEmacs09_$(version)_windows-32-mecb/	
+zip-windows: folder-windows
 	zip MicroEmacs09_$(version)_windows-32-mewb.zip MicroEmacs09_$(version)_windows-32-mewb/*
 	zip MicroEmacs09_$(version)_windows-32-mecb.zip MicroEmacs09_$(version)_windows-32-mecb/*
 me-ehf: