From 869447ff69c4832dfe0a14c382f67d5dea867def Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Tue, 12 Jan 2010 20:12:56 +0000
Subject: Move Makefile definitions for CC and STRIP into config.make, use
 versions from autoconf.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1808
---
 pkg/osx/GNUmakefile | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'pkg/osx')

diff --git a/pkg/osx/GNUmakefile b/pkg/osx/GNUmakefile
index 3cab6bf7..de2c535a 100644
--- a/pkg/osx/GNUmakefile
+++ b/pkg/osx/GNUmakefile
@@ -1,9 +1,6 @@
 
 include ../config.make
 
-CC=gcc
-STRIP=strip
-
 STAGING_DIR=staging
 DMG=$(PACKAGE_TARNAME)-$(PACKAGE_VERSION).dmg
 
@@ -32,10 +29,12 @@ $(STAGING_DIR): launcher $(TOPLEVEL_DOCS)
 	cp -R app-skeleton "$(APP_DIR)"
 	mkdir "$(APP_BIN_DIR)"
 	cp Info.plist "$(APP_DIR)/Contents/"
+
 	cp launcher "$(APP_BIN_DIR)/"
+	$(STRIP) "$(APP_BIN_DIR)/launcher"
 
-	./cp-with-libs $(TOPLEVEL)/src/chocolate-doom "$(APP_BIN_DIR)"
-	$(STRIP) "$(APP_BIN_DIR)/chocolate-doom"
+	./cp-with-libs $(TOPLEVEL)/src/$(PACKAGE_TARNAME) "$(APP_BIN_DIR)"
+	$(STRIP) "$(APP_BIN_DIR)/$(PACKAGE_TARNAME)"
 	./cp-with-libs $(TOPLEVEL)/setup/chocolate-setup "$(APP_BIN_DIR)"
 	$(STRIP) "$(APP_BIN_DIR)/chocolate-setup"
 
-- 
cgit v1.2.3