From a34d5bb6abb825b366e9b5e215266587936f9365 Mon Sep 17 00:00:00 2001
From: rubidium <rubidium@openttd.org>
Date: Sat, 16 May 2009 12:36:33 +0000
Subject: (svn r16318) -Change: use !! instead of @@ in src/*.in too. -Change:
 use @ instead of ~ in configure/Makefiles so Debian's build system(s) can
 also build RC binaries.

---
 src/ottdres.rc.in | 8 ++++----
 src/rev.cpp.in    | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/ottdres.rc.in b/src/ottdres.rc.in
index 6fe8c5e11..c65f10abf 100644
--- a/src/ottdres.rc.in
+++ b/src/ottdres.rc.in
@@ -64,8 +64,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,8,0,@@REVISION@@
- PRODUCTVERSION 0,8,0,@@REVISION@@
+ FILEVERSION 0,8,0,!!REVISION!!
+ PRODUCTVERSION 0,8,0,!!REVISION!!
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -83,14 +83,14 @@ BEGIN
             VALUE "Comments", "This program is licensed under the GNU General Public License.\0"
             VALUE "CompanyName", "OpenTTD Development Team\0"
             VALUE "FileDescription", "OpenTTD\0"
-            VALUE "FileVersion", "Development @@VERSION@@\0"
+            VALUE "FileVersion", "Development !!VERSION!!\0"
             VALUE "InternalName", "openttd\0"
             VALUE "LegalCopyright", "Copyright \xA9 OpenTTD Developers 2002-2009. All Rights Reserved.\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "openttd.exe\0"
             VALUE "PrivateBuild", "\0"
             VALUE "ProductName", "OpenTTD\0"
-            VALUE "ProductVersion", "Development @@VERSION@@\0"
+            VALUE "ProductVersion", "Development !!VERSION!!\0"
             VALUE "SpecialBuild", "-\0"
         END
     END
diff --git a/src/rev.cpp.in b/src/rev.cpp.in
index a60dd3444..db79958f0 100644
--- a/src/rev.cpp.in
+++ b/src/rev.cpp.in
@@ -20,7 +20,7 @@
  * norev000 is for non-releases that are made on systems without
  * subversion or sources that are not a checkout of subversion.
  */
-const char _openttd_revision[] = "@@VERSION@@";
+const char _openttd_revision[] = "!!VERSION!!";
 
 /**
  * Let us know if current build was modified. This detection
@@ -30,7 +30,7 @@ const char _openttd_revision[] = "@@VERSION@@";
  * (compiling from sources without any version control software)
  * and 2 is for modified revision.
  */
-const byte _openttd_revision_modified = @@MODIFIED@@;
+const byte _openttd_revision_modified = !!MODIFIED!!;
 
 /**
  * The NewGRF revision of OTTD:
@@ -45,11 +45,11 @@ const byte _openttd_revision_modified = @@MODIFIED@@;
  * final release will always have a lower version number than the released
  * version, thus making comparisions on specific revisions easy.
  */
-const uint32 _openttd_newgrf_version = 0 << 28 | 8 << 24 | 0 << 20 | 0 << 19 | (@@REVISION@@ & ((1 << 19) - 1));
+const uint32 _openttd_newgrf_version = 0 << 28 | 8 << 24 | 0 << 20 | 0 << 19 | (!!REVISION!! & ((1 << 19) - 1));
 
 #ifdef __MORPHOS__
 /**
  * Variable used by MorphOS to show the version.
  */
-extern const char morphos_versions_tag[] = "$VER: OpenTTD @@VERSION@@ (@@DATE@@) OpenTTD Team [MorphOS, PowerPC]";
+extern const char morphos_versions_tag[] = "$VER: OpenTTD !!VERSION!! (!!DATE!!) OpenTTD Team [MorphOS, PowerPC]";
 #endif
-- 
cgit v1.2.3-54-g00ecf