summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorNick White <git@njw.name>2022-02-23 22:22:43 +0000
committerNick White <git@njw.name>2022-02-23 22:22:43 +0000
commitc770a86cca74f3b6235000c77c2ab74487e2ac2a (patch)
tree0950d7c205f327247aa1ce2bb10b7c7d1bfa4c55 /Makefile
parent7cf1d3a0d014a6a7f940262574c95260cbce5fc5 (diff)
parent4f928ca657afc464425b6fe49f264a94450e4ed0 (diff)
Merge remote-tracking branch 'ssh/master'
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile9
1 files changed, 4 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index b697fd2..c659ba6 100644
--- a/Makefile
+++ b/Makefile
@@ -89,18 +89,18 @@ getxbookgui.exe: getxbookgui.tcl
echo STARPACK $@
sed 's/ icons/ .. icons/' < getxbookgui.tcl > getxbookgui-win.tcl
sed -i '/^\tset cmd / i set cmdbin [file join tools $$cmdbin]' getxbookgui-win.tcl
- sdx qwrap getxbookgui-win.tcl getxbookgui
- sdx unwrap getxbookgui.kit
+ $(SDX) qwrap getxbookgui-win.tcl getxbookgui
+ $(SDX) unwrap getxbookgui.kit
cp -f getxbook.ico getxbookgui.vfs/tclkit.ico
echo 'FileDescription "Book downloader"' > getxbookgui.vfs/tclkit.inf
- sdx wrap $@ -runtime $(W32TCLKIT)
+ $(SDX) wrap $@ -runtime $(W32TCLKIT)
rm -r getxbookgui-win.tcl getxbookgui.kit getxbookgui.vfs
# needs config.mk set up to use mingw
dist-win: $(BIN) $(GUI:.tcl=.exe)
mkdir -p $(NAME)-win/tools
cp $(GUI:.tcl=.exe) $(NAME)-win
- for f in $(BIN); do cp $$f $(NAME)-win/tools/$$f.exe; done
+ for f in $(BIN); do cp $$f.exe $(NAME)-win/tools/$$f.exe; done
mkdir -p $(NAME)-win/icons
cp icons/* $(NAME)-win/icons/
for f in LEGAL README COPYING; do \
@@ -110,7 +110,6 @@ dist-win: $(BIN) $(GUI:.tcl=.exe)
groff -m man -T utf8 < $$f | col -bx | sed 's/$$/\r/g' > $(NAME)-win/tools/$$b.txt; done
mv $(NAME)-win/tools/getxbookgui.txt $(NAME)-win/
cd $(NAME)-win; zip -r ../$(NAME)-$(VERSION)-win.zip .;cd ..
- gpg -b < $(NAME)-$(VERSION)-win.zip > $(NAME)-$(VERSION)-win.zip.sig
rm -rf $(NAME)-win
echo $(NAME)-$(VERSION)-win.zip $(NAME)-$(VERSION)-win.zip.sig