From f184baa88875efea3ae742cf1776e85ba152186b Mon Sep 17 00:00:00 2001
From: Nick White <git@njw.me.uk>
Date: Tue, 1 May 2012 00:46:30 +0100
Subject: Remove starpack on OSX make rules, as osx bundles tcl/tk

---
 Makefile  | 12 +++---------
 config.mk |  1 -
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index 2871971..fe92e1a 100644
--- a/Makefile
+++ b/Makefile
@@ -68,13 +68,6 @@ getxbookgui.exe: getxbookgui.tcl
 	@sdx wrap $@ -runtime $(W32TCLKIT)
 	@rm -r getxbookgui.kit getxbookgui.vfs
 
-getxbookgui: getxbookgui.tcl
-	@echo STARPACK $@
-	@sdx qwrap getxbookgui.tcl
-	@sdx unwrap getxbookgui.kit
-	@sdx wrap $@ -runtime $(MACTCLKIT)
-	@rm -r getxbookgui.kit getxbookgui.vfs
-
 # needs to be run from a mingw setup
 dist-win: $(BIN) $(GUI:.tcl=.exe)
 	mkdir -p $(NAME)-win
@@ -89,10 +82,11 @@ dist-win: $(BIN) $(GUI:.tcl=.exe)
 	echo $(NAME)-$(VERSION)-win.zip $(NAME)-$(VERSION)-win.zip.sig
 
 # needs to be run from a mac
-dist-mac: $(BIN) $(GUI:.tcl=)
+dist-mac: $(BIN) $(GUI)
 	mkdir -p $(NAME)-$(VERSION)/$(NAME).app/Contents/MacOS
 	mkdir -p $(NAME)-$(VERSION)/$(NAME).app/Contents/Resources
-	cp $(BIN) $(GUI:.tcl=) $(NAME)-$(VERSION)/$(NAME).app/Contents/MacOS/
+	cp $(BIN) $(NAME)-$(VERSION)/$(NAME).app/Contents/MacOS/
+	cp $(GUI) $(NAME)-$(VERSION)/$(NAME).app/Contents/MacOS/$(GUI:.tcl=)
 	for f in $(DOC); do cp $$f $(NAME)-$(VERSION)/$$f.txt; done
 	echo '<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"><plist version="1.0"><dict><key>CFBundlePackageType</key><string>APPL</string>'"<key>CFBundleExecutable</key><string>getxbookgui</string><key>CFBundleVersion</key><string>$(VERSION)</string><key>CFBundleName</key><string>$(NAME)</string></dict></plist>" > $(NAME)-$(VERSION)/$(NAME).app/Contents/Info.plist
 	hdiutil create -srcfolder $(NAME) $(NAME)-$(VERSION).dmg
diff --git a/config.mk b/config.mk
index efe4e2e..d9b9562 100644
--- a/config.mk
+++ b/config.mk
@@ -10,7 +10,6 @@ CFLAGS = -std=c99 -pedantic -Wall -Wextra -Werror -g -D_POSIX_C_SOURCE=200112L \
          -DVERSION=\"$(VERSION)\"
 
 W32TCLKIT = tclkit-8.5.9-win32.upx.exe
-MACTCLKIT = tclkit-8.5b1-darwin-univ-aqua
 
 # musl static
 #CC = musl-gcc
-- 
cgit v1.2.3