Author: ivanovic
Date: Mon Feb 2 18:40:02 2009
New Revision: 32554
URL: http://svn.gna.org/viewcvs/wesnoth?rev=32554&view=rev
Log:
define the ingame version *only* in src/wesconfig.h for this forcing an undef
is needed to get around autotools...
the config.h.dummy seems to not be used at all by autotools, so removing it now
Removed:
trunk/config.h.dummy
Modified:
trunk/src/wesconfig.h
Removed: trunk/config.h.dummy
URL: http://svn.gna.org/viewcvs/wesnoth/trunk/config.h.dummy?rev=32553&view=auto
==============================================================================
--- trunk/config.h.dummy (original)
+++ trunk/config.h.dummy (removed)
@@ -1,21 +1,0 @@
-
-/* Name of package */
-#define PACKAGE "wesnoth"
-
-/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT "http://bugs.wesnoth.org";
-
-/* Define to the full name of this package. */
-#define PACKAGE_NAME "Battle for Wesnoth"
-
-/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "Battle for Wesnoth 1.5.9+svn"
-
-/* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME "wesnoth"
-
-/* Define to the version of this package. */
-#define PACKAGE_VERSION "1.5.9+svn"
-
-/* Version number of package */
-#define VERSION "1.5.9+svn"
Modified: trunk/src/wesconfig.h
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/wesconfig.h?rev=32554&r1=32553&r2=32554&view=diff
==============================================================================
--- trunk/src/wesconfig.h (original)
+++ trunk/src/wesconfig.h Mon Feb 2 18:40:02 2009
@@ -24,9 +24,14 @@
# define LOCALEDIR "translations"
# endif
#endif
-#ifndef VERSION
+
+//always use the version string in here, otherwise autotools can override in
+//a bad way...
+#ifdef VERSION
+ #undef VERSION
+#endif
#define VERSION "1.5.9+svn"
-#endif
+
#ifndef PACKAGE
#define PACKAGE "wesnoth"
#endif
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
