From 184ea9ba501adf04b9b352760774fde268c0cc7f Mon Sep 17 00:00:00 2001 From: Simon Howard Date: Sat, 14 May 2011 20:11:26 +0000 Subject: Convert build system to using the PROGRAM_PREFIX system used on raven-branch. Subversion-branch: /trunk/chocolate-doom Subversion-revision: 2336 --- configure.in | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'configure.in') diff --git a/configure.in b/configure.in index c653f4e9..7007b96e 100644 --- a/configure.in +++ b/configure.in @@ -112,6 +112,16 @@ AM_INIT_AUTOMAKE([1.8.0]) WINDOWS_RC_VERSION=`echo $PACKAGE_VERSION.0 | sed 's/\./, /g' ` +# This controls the prefix added to the start of program names. For example, +# if this is changed to "lemon-", the programs generated will be named +# lemon-doom, lemon-heretic, etc. + +PROGRAM_PREFIX=chocolate- + +AC_SUBST(PROGRAM_PREFIX) +AC_DEFINE_UNQUOTED(PROGRAM_PREFIX, "$PROGRAM_PREFIX", + Change this when you create your awesome forked version) + AM_CONFIG_HEADER(config.h:config.hin) AC_SUBST(WINDOWS_RC_VERSION) @@ -145,6 +155,7 @@ pkg/osx/Info.plist pkg/osx/Info-gnustep.plist setup/Makefile setup/setup-res.rc +setup/setup-manifest.xml src/Makefile src/doom-screensaver.desktop src/resource.rc -- cgit v1.2.3 From d07b88e469abbb7c82d10fbe17473d529aaa4388 Mon Sep 17 00:00:00 2001 From: Simon Howard Date: Sat, 14 May 2011 21:07:55 +0000 Subject: Add freedesktop.org desktop files for chocolate-doom, chocolate-setup (thanks Adrián Chaves Fernández). Subversion-branch: /trunk/chocolate-doom Subversion-revision: 2337 --- configure.in | 3 +++ 1 file changed, 3 insertions(+) (limited to 'configure.in') diff --git a/configure.in b/configure.in index 7007b96e..2ef7c41c 100644 --- a/configure.in +++ b/configure.in @@ -154,9 +154,12 @@ pkg/config.make pkg/osx/Info.plist pkg/osx/Info-gnustep.plist setup/Makefile +setup/setup.desktop setup/setup-res.rc setup/setup-manifest.xml +data/Makefile src/Makefile +src/doom.desktop src/doom-screensaver.desktop src/resource.rc textscreen/Makefile -- cgit v1.2.3 From 822664b4ff873d462370e9e96a9d91e6066c221d Mon Sep 17 00:00:00 2001 From: Simon Howard Date: Tue, 17 May 2011 22:59:44 +0000 Subject: Update NEWS and ChangeLog, bump version number. Subversion-branch: /trunk/chocolate-doom Subversion-revision: 2342 --- configure.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'configure.in') diff --git a/configure.in b/configure.in index 2ef7c41c..dbb48777 100644 --- a/configure.in +++ b/configure.in @@ -1,7 +1,7 @@ -AC_INIT(Chocolate Doom, 1.5.0, fraggle@gmail.com, chocolate-doom) +AC_INIT(Chocolate Doom, 1.6.0, fraggle@gmail.com, chocolate-doom) PACKAGE_SHORTDESC="Conservative Doom source port" -PACKAGE_COPYRIGHT="Copyright (C) 1993-2010" +PACKAGE_COPYRIGHT="Copyright (C) 1993-2011" PACKAGE_LICENSE="GNU General Public License, version 2" PACKAGE_MAINTAINER="Simon Howard" PACKAGE_URL="http://www.chocolate-doom.org/" -- cgit v1.2.3 From 16dc726ccb49d94def51487486bf81958620e81d Mon Sep 17 00:00:00 2001 From: Simon Howard Date: Thu, 16 Jun 2011 23:14:14 +0000 Subject: Add AM_SILENT_RULES macro for terser build output. Subversion-branch: /trunk/chocolate-doom Subversion-revision: 2350 --- configure.in | 1 + 1 file changed, 1 insertion(+) (limited to 'configure.in') diff --git a/configure.in b/configure.in index dbb48777..5768c2d3 100644 --- a/configure.in +++ b/configure.in @@ -109,6 +109,7 @@ AM_CONDITIONAL(HAVE_PYTHON, $HAVE_PYTHON) dnl Automake v1.8.0 is required, please upgrade! AM_INIT_AUTOMAKE([1.8.0]) +m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) WINDOWS_RC_VERSION=`echo $PACKAGE_VERSION.0 | sed 's/\./, /g' ` -- cgit v1.2.3