[Freeciv-Dev] (PR#10409) [Patch] Build data/Freeciv with correct version string

["Marko Lindqvist" <marko.lindqvist@xxxxxxxxxxx>]

<URL: http://rt.freeciv.org/Ticket/Display.html?id=10409 >


  Making separate ticket for this patch.

  Updated against CVS.


Marko Lindqvist wrote:
> <URL: http://rt.freeciv.org/Ticket/Display.html?id=4712 >
> 
>   Let autoconf to build data/Freeciv with correct version string as it 
> already knows it.
>   Rename data/Freeciv as data/Freeciv.in prior to applying this patch.
> 
>   As a side effect, this file is now in builddir and no longer in 
> srcdir. This probably means another thing to worry about in #9852.

  This was taken care of in #9852.


  - Caz

diff -Nurd -X.diff_ignore freeciv/client/gui-xaw/Makefile.am 
freeciv/client/gui-xaw/Makefile.am
--- freeciv/client/gui-xaw/Makefile.am  2004-10-02 08:50:03.062500000 +0300
+++ freeciv/client/gui-xaw/Makefile.am  2004-10-02 10:48:48.796875000 +0300
@@ -11,11 +11,11 @@
 BUILT_SOURCES = Freeciv.h
 CLEANFILES = Freeciv.h
 
-Freeciv.h: $(top_srcdir)/data/Freeciv
+Freeciv.h: $(top_builddir)/data/Freeciv
        echo '/**************************************************/' > Freeciv.h
        echo '/* DO NOT EDIT THIS FILE, EDIT ../../data/Freeciv */' >> Freeciv.h
        echo '/**************************************************/' >> Freeciv.h
-       $(srcdir)/ad2c $(top_srcdir)/data/Freeciv >> Freeciv.h
+       $(srcdir)/ad2c $(top_builddir)/data/Freeciv >> Freeciv.h
 
 libguiclient_a_DEPENDENCIES = ad2c
 
diff -Nurd -X.diff_ignore freeciv/configure.ac freeciv/configure.ac
--- freeciv/configure.ac        2004-10-02 08:50:03.750000000 +0300
+++ freeciv/configure.ac        2004-10-02 11:04:00.031250000 +0300
@@ -677,6 +677,7 @@
          doc/sv/Makefile
          freeciv.spec:bootstrap/freeciv.spec.in
          bootstrap/undep.sh
+         data/Freeciv
          client/freeciv.desktop:bootstrap/freeciv.desktop.in])
 AC_CONFIG_FILES([civ:bootstrap/civ.in], [chmod +x civ])
 AC_CONFIG_FILES([ser:bootstrap/ser.in], [chmod +x ser])
diff -Nurd -X.diff_ignore freeciv/configure.in freeciv/configure.in
--- freeciv/configure.in        2004-10-02 08:50:03.750000000 +0300
+++ freeciv/configure.in        2004-10-02 11:04:14.046875000 +0300
@@ -671,5 +671,6 @@
          ser:bootstrap/ser.in
          freeciv.spec:bootstrap/freeciv.spec.in
          bootstrap/undep.sh
+         data/Freeciv
          client/freeciv.desktop:bootstrap/freeciv.desktop.in,
          [ chmod +x bootstrap/undep.sh civ ser ; bootstrap/undep.sh ])
diff -Nurd -X.diff_ignore freeciv/data/Freeciv.in freeciv/data/Freeciv.in
--- freeciv/data/Freeciv.in     2004-10-02 10:48:31.687500000 +0300
+++ freeciv/data/Freeciv.in     2004-10-02 10:48:48.828125000 +0300
@@ -5,7 +5,7 @@
 ! none widgets resources
 ! gotAppDefFile MUST be the first entry!
 Freeciv*gotAppDefFile:                       True
-Freeciv*version:                             1.14.99-devel
+Freeciv*version:                             @VERSION@
 Freeciv.title:                               Freeciv
 Freeciv.iconName:                            Freeciv
 Freeciv*borderColor:                         black
diff -Nurd -X.diff_ignore freeciv/version.in freeciv/version.in
--- freeciv/version.in  2004-10-02 08:50:20.843750000 +0300
+++ freeciv/version.in  2004-10-02 10:48:48.843750000 +0300
@@ -6,8 +6,8 @@
 FREECIV_VERSION_COMMENT("  language used. Don't add comments             ")
 FREECIV_VERSION_COMMENT("  specific to some language into this file.     ")
 
-FREECIV_VERSION_COMMENT("  For now version information in data/Freeciv   ")
-FREECIV_VERSION_COMMENT("  and common/version.h                          ")
+FREECIV_VERSION_COMMENT("  For now version information in                ")
+FREECIV_VERSION_COMMENT("  common/version.h                              ")
 FREECIV_VERSION_COMMENT("  must be updated manually when ever this file  ")
 FREECIV_VERSION_COMMENT("  changes.                                      ")