commit 869447ff69c4832dfe0a14c382f67d5dea867def
Author: Simon Howard <fraggle@gmail.com>
AuthorDate: Tue Jan 12 20:12:56 2010 +0000
Commit: Simon Howard <fraggle@gmail.com>
CommitDate: Tue Jan 12 20:12:56 2010 +0000
Move Makefile definitions for CC and STRIP into config.make, use
versions from autoconf.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1808
---
pkg/config.make.in | 27 ++++++++++++++++++---------
pkg/osx/GNUmakefile | 9 ++++-----
2 files changed, 22 insertions(+), 14 deletions(-)
diff --git a/pkg/config.make.in b/pkg/config.make.in
index caedab23..d8d72c60 100644
--- a/pkg/config.make.in
+++ b/pkg/config.make.in
@@ -1,5 +1,14 @@
-# File included by package makefiles that contains details
-# about the package name, generated by configure.
+# Shared file included by the makefiles used to build packages.
+# This contains various information needed by the makefiles,
+# and is autogenerated by configure to include various
+# necessary details.
+
+# Tools needed:
+
+CC = @CC@
+STRIP = @STRIP@
+
+# Package name and version number:
PACKAGE = @PACKAGE@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -9,11 +18,11 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
# Documentation files to distribute with packages.
-DOC_FILES=README \
- COPYING \
- ChangeLog \
- NEWS \
- BUGS \
- CMDLINE \
- TODO
+DOC_FILES = README \
+ COPYING \
+ ChangeLog \
+ NEWS \
+ BUGS \
+ CMDLINE \
+ TODO
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"