From 860a17497bdc189f78f5a0bca000a0451d5ae624 Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Tue, 5 Jan 2010 15:52:12 +0000
Subject: Move config.make up to pkg/ directory. Use static makefiles to
 generate all packages, rather than dynamically generated makefiles. Add
 pkg/osx to dist. Make OS X staging directory depend on top level
 documentation files. Generate CMDLINE as part of standard build if it is not
 already present. Set svn:ignore properties.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1790
---
 pkg/config.make.in | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 pkg/config.make.in

(limited to 'pkg/config.make.in')

diff --git a/pkg/config.make.in b/pkg/config.make.in
new file mode 100644
index 00000000..caedab23
--- /dev/null
+++ b/pkg/config.make.in
@@ -0,0 +1,19 @@
+# File included by package makefiles that contains details
+# about the package name, generated by configure.
+
+PACKAGE = @PACKAGE@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+
+# Documentation files to distribute with packages.
+
+DOC_FILES=README       \
+          COPYING      \
+          ChangeLog    \
+          NEWS         \
+          BUGS         \
+          CMDLINE      \
+          TODO
+
-- 
cgit v1.2.3


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/config.make.in | 27 ++++++++++++++++++---------
 1 file changed, 18 insertions(+), 9 deletions(-)

(limited to 'pkg/config.make.in')

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
 
-- 
cgit v1.2.3