[Freeciv-Dev] (PR#8635) [PATCH] Correct FREECIV_PATH for binaries form civ & ser scripts

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

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


  export_FREECIV_PATH.diff: FREECIV_PATH must be exported to binaries.

  Simple 'make' does not regenerate civ & ser scripts after 
$(top_srcdir)/%.in changes, running configure or config.status is required.
  Second patch, rebuild_civ_ser.diff, is at least partial solution to 
that. Whenever civ.in or ser.in changes, config.status runs.
  But I think there is more to do:
 > cd freeciv_build
 > rm civ
 > make
...
 > find civ
find: civ: No such file or directory


  However, targets for 'civ' and 'ser' do exist, even if 'all' does not 
depend on them:
 > cd freeciv_build
 > rm civ
 > make civ
...
 > find civ
civ

  So I'm back to automake & autoconf manuals to find out what is right 
way to make 'all' depend on those targets (and if we can even trust them 
to always exist)


  - Caz


diff -Nurd freeciv/civ.in freeciv/civ.in
--- freeciv/civ.in      2004-03-27 20:44:16.000000000 +0200
+++ freeciv/civ.in      2004-05-01 22:46:44.875000000 +0300
@@ -14,7 +14,7 @@
 #
 #***********************************************************************/
 DIR=`dirname $0`
-FREECIV_PATH="@top_srcdir@/data:$FREECIV_PATH"
+export FREECIV_PATH="@top_srcdir@/data:$FREECIV_PATH"
 
 [ -x $DIR/client/civclient ] && EXE=$DIR/client/civclient
 [ -x $DIR/civclient ] && EXE=$DIR/civclient
diff -Nurd freeciv/ser.in freeciv/ser.in
--- freeciv/ser.in      2004-03-27 20:44:16.000000000 +0200
+++ freeciv/ser.in      2004-05-01 22:46:48.234375000 +0300
@@ -14,7 +14,7 @@
 #
 #***********************************************************************/
 DIR=`dirname $0`
-FREECIV_PATH="@top_srcdir@/data:$FREECIV_PATH"
+export FREECIV_PATH="@top_srcdir@/data:$FREECIV_PATH"
 
 [ -x $DIR/server/civserver ] && EXE=$DIR/server/civserver
 [ -x $DIR/civserver ] && EXE=$DIR/civserver

diff -Nurd freeciv/configure.ac freeciv/configure.ac
--- freeciv/configure.ac        2004-04-29 08:37:14.000000000 +0300
+++ freeciv/configure.ac        2004-05-01 22:48:06.296875000 +0300
@@ -672,6 +672,8 @@
   CFLAGS="$EXTRA_GCC_DEBUG_CFLAGS $CFLAGS"
 fi
 
+AC_SUBST([CONFIG_STATUS_DEPENDENCIES], ['$(top_srcdir)/ser.in 
$(top_srcdir)/civ.in'])
+
 AC_CONFIG_FILES([Makefile
           data/Makefile 
          data/misc/Makefile