summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBent Bisballe Nyeng <deva@aasimon.org>2011-11-17 14:29:25 +0100
committerBent Bisballe Nyeng <deva@aasimon.org>2011-11-17 14:29:25 +0100
commit69d26642da5ca087b5f3acb7dd77fbd0344f085a (patch)
treeb5ca71b6f500e566060ed1c325775ad334321d21
parenta47a8ec567872c2b96eb35efb60273060e32df4d (diff)
Remove common VERSION file and put version numbers directly in configure.in and client.pro files allowing for diverging versions.
-rw-r--r--VERSION1
-rw-r--r--client/client.pro3
-rw-r--r--server/configure.in2
3 files changed, 2 insertions, 4 deletions
diff --git a/VERSION b/VERSION
deleted file mode 100644
index 52b6a1f..0000000
--- a/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-VERSION=2.2.0 \ No newline at end of file
diff --git a/client/client.pro b/client/client.pro
index 61a6e06..dce4838 100644
--- a/client/client.pro
+++ b/client/client.pro
@@ -16,8 +16,7 @@ debug {
DEFINES+=USE_DEBUG
}
-include(../VERSION)
-DEFINES+=VERSION=\\\"$$VERSION\\\"
+DEFINES+=VERSION=\\\"2.2.0\\\"
win32 {
LIBPATH += lua/lib
diff --git a/server/configure.in b/server/configure.in
index fcab921..c647aed 100644
--- a/server/configure.in
+++ b/server/configure.in
@@ -2,7 +2,7 @@
AC_INIT(src/pracrod.cc)
-VERSION="`cat ../VERSION | cut -d'=' -f2`"
+VERSION="2.2.0"
AM_INIT_AUTOMAKE( pracrod, $VERSION )
dnl ======================