summaryrefslogtreecommitdiff
path: root/configure.in
diff options
context:
space:
mode:
authorSimon Howard2011-09-11 23:40:44 +0000
committerSimon Howard2011-09-11 23:40:44 +0000
commitefd15d965dee947a04727bb62f4e2092cf28732f (patch)
tree730d99c1e88d5e3145e552ad69dec52d30026d01 /configure.in
parent4d17ab361e90a75dc6deefd37e6eb2ba0610b386 (diff)
parent11024d8214580d63ca7a9e70a121f5ff542a2fce (diff)
downloadchocolate-doom-efd15d965dee947a04727bb62f4e2092cf28732f.tar.gz
chocolate-doom-efd15d965dee947a04727bb62f4e2092cf28732f.tar.bz2
chocolate-doom-efd15d965dee947a04727bb62f4e2092cf28732f.zip
Merge from raven-branch.
Subversion-branch: /branches/strife-branch Subversion-revision: 2367
Diffstat (limited to 'configure.in')
-rw-r--r--configure.in8
1 files changed, 6 insertions, 2 deletions
diff --git a/configure.in b/configure.in
index ebbdfbde..325a707e 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/"
@@ -110,6 +110,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' `
@@ -154,7 +155,9 @@ pkg/config.make
pkg/osx/Info-gnustep.plist
pkg/osx/Info.plist
rpm.spec
+data/Makefile
src/Makefile
+src/doom.desktop
src/doom-screensaver.desktop
src/doom/Makefile
src/heretic/Makefile
@@ -162,6 +165,7 @@ src/hexen/Makefile
src/resource.rc
src/setup-res.rc
src/setup/Makefile
+src/setup/setup.desktop
src/setup/setup-manifest.xml
src/strife/Makefile
textscreen/Makefile